Parcourir la source

Cleanup output clutter

tags/r14.0.0
Slávek Banko il y a 6 ans
Parent
révision
74b1fc6576

+ 1
- 1
kcontrol/displayconfig/displayconfig.cpp Voir le fichier

@@ -508,7 +508,7 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
508 508
 		}
509 509
 	}
510 510
 	else {
511
-		printf("[WARNING] Display layout broken...\n\r"); fflush(stdout);
511
+		printf("[WARNING] Display layout broken...\n"); fflush(stdout);
512 512
 	}
513 513
 
514 514
 	layoutDragDropDisplay();

+ 1
- 1
kcontrol/iccconfig/iccconfig.cpp Voir le fichier

@@ -416,7 +416,7 @@ void KICCConfig::save()
416 416
 		errorstr = randrsimple->clearIccConfiguration();
417 417
 	}
418 418
 	if (errorstr != "") {
419
-		KMessageBox::error(this, TQString("Unable to apply ICC configuration:\n\r%1").arg(errorstr));
419
+		KMessageBox::error(this, TQString("Unable to apply ICC configuration:\n%1").arg(errorstr));
420 420
 	}
421 421
 
422 422
 	emit changed(false);

+ 9
- 9
kcontrol/randr/tderandrtray.cpp Voir le fichier

@@ -60,7 +60,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
60 60
 	TQToolTip::add(this, i18n("Screen resize & rotate"));
61 61
 	my_parent = parent;
62 62
 
63
-	//printf("Reading configuration...\n\r");
63
+	//printf("Reading configuration...\n");
64 64
 	globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
65 65
 	TDEGlobalAccel* keys = globalKeys;
66 66
 #include "tderandrbindings.cpp"
@@ -465,7 +465,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
465 465
 void KRandRSystemTray::slotResolutionChanged(int parameter)
466 466
 {
467 467
 	if (currentScreen()->currentSize() == parameter) {
468
-		//printf("This resolution is already in use; applying again...\n\r");
468
+		//printf("This resolution is already in use; applying again...\n");
469 469
 		currentScreen()->proposeSize(parameter);
470 470
 		currentScreen()->applyProposed();
471 471
 		return;
@@ -619,8 +619,8 @@ void KRandRSystemTray::slotCycleDisplays()
619 619
 		}
620 620
 	}
621 621
 
622
-	//printf("Active: %d\n\r", current_on_index);
623
-	//printf("Max: %d\n\r", max_index);
622
+	//printf("Active: %d\n", current_on_index);
623
+	//printf("Max: %d\n", max_index);
624 624
 
625 625
 	if ((current_on_index == -1) && (max_index == -1)) {
626 626
 		// There is no connected display available!  ABORT
@@ -740,7 +740,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
740 740
 			}
741 741
 
742 742
 			output_name = output_info->name;
743
-			//printf("ON: Found output %s\n\r", output_name);
743
+			//printf("ON: Found output %s\n", output_name);
744 744
 
745 745
 			lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name));
746 746
 			menu->setItemChecked(lastIndex, true);
@@ -762,7 +762,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
762 762
 			}
763 763
 
764 764
 			output_name = output_info->name;
765
-			//printf("CONNECTED, NOT ON: Found output %s\n\r", output_name);
765
+			//printf("CONNECTED, NOT ON: Found output %s\n", output_name);
766 766
 
767 767
 			lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name));
768 768
 			menu->setItemChecked(lastIndex, false);
@@ -784,7 +784,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
784 784
 			}
785 785
 
786 786
 			output_name = output_info->name;
787
-			//printf("DISCONNECTED, NOT ON: Found output %s\n\r", output_name);
787
+			//printf("DISCONNECTED, NOT ON: Found output %s\n", output_name);
788 788
 
789 789
 			lastIndex = menu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name));
790 790
 			menu->setItemChecked(lastIndex, false);
@@ -835,7 +835,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter)
835 835
 	}
836 836
 
837 837
 	if (!randr_screen_info->outputs[parameter]->cur_crtc) {
838
-		//printf("Screen was off, turning it on...\n\r");
838
+		//printf("Screen was off, turning it on...\n");
839 839
 
840 840
 		randr_screen_info->cur_crtc = randr_screen_info->outputs[parameter]->cur_crtc;
841 841
 		randr_screen_info->cur_output = randr_screen_info->outputs[parameter];
@@ -851,7 +851,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter)
851 851
 	}
852 852
 	else {
853 853
 		if (num_outputs_on > 1) {
854
-			//printf("Screen was on, turning it off...\n\r");
854
+			//printf("Screen was on, turning it off...\n");
855 855
 			randr_screen_info->cur_crtc = randr_screen_info->outputs[parameter]->cur_crtc;
856 856
 			randr_screen_info->cur_output = randr_screen_info->outputs[parameter];
857 857
 			randr_screen_info->cur_output->auto_set = 0;

+ 1
- 1
kdesktop/bgmanager.cc Voir le fichier

@@ -599,7 +599,7 @@ void KBackgroundManager::slotImageDone(int desk)
599 599
     if (current)
600 600
     {
601 601
         //KPixmap * viewport_background = new KPixmap(TQPixmap(pm->width()*s.width(), pm->height()*s.height()));
602
-        //printf("slotImageDone(): x: %d y: %d\n\r", viewport_background->size().width(), viewport_background->size().height());
602
+        //printf("slotImageDone(): x: %d y: %d\n", viewport_background->size().width(), viewport_background->size().height());
603 603
         //setPixmap(viewport_background, r->hash(), desk);
604 604
         //delete viewport_background;
605 605
         

+ 4
- 4
kdesktop/kxdglauncher.cpp Voir le fichier

@@ -108,7 +108,7 @@ int main( int argc, char **argv)
108 108
 			TQDir myqdir;
109 109
 			if (myqdir.exists(getDocumentPath(), TRUE) == true) {
110 110
 				if (args->isSet( "getpath" ) == true) {
111
-					printf("%s\n\r", (const char *)getDocumentPath().local8Bit());
111
+					printf("%s\n", (const char *)getDocumentPath().local8Bit());
112 112
 					return 0;
113 113
 				}
114 114
 				else {
@@ -152,7 +152,7 @@ int main( int argc, char **argv)
152 152
 								config.writeEntry("XDG_DOCUMENTS_DIR", TQString("\"") + xdgModifiedDirectory + TQString("\""), true);
153 153
 								config.sync();
154 154
 								if (args->isSet( "getpath" ) == true) {
155
-									printf("%s\n\r", (const char *)getDocumentPath().local8Bit());
155
+									printf("%s\n", (const char *)getDocumentPath().local8Bit());
156 156
 									return 0;
157 157
 								}
158 158
 								else {
@@ -177,12 +177,12 @@ int main( int argc, char **argv)
177 177
 			}
178 178
 		}
179 179
 		else {
180
-			printf("[kxdglauncher] XDG variable not recognized\n\r");
180
+			printf("[kxdglauncher] XDG variable not recognized\n");
181 181
 			return 1;
182 182
 		}
183 183
 	}
184 184
 	else {
185
-		printf("[kxdglauncher] Please specify the desired XDG variable name with --xdgname\n\r");
185
+		printf("[kxdglauncher] Please specify the desired XDG variable name with --xdgname\n");
186 186
 		return 1;
187 187
 	}
188 188
 }

+ 8
- 8
kdesktop/lock/lockprocess.cc Voir le fichier

@@ -148,10 +148,10 @@ void print_trace()
148 148
 	size = backtrace (array, 10);
149 149
 	strings = backtrace_symbols (array, size);
150 150
 
151
-	printf ("[kdesktop_lock] Obtained %zd stack frames.\n\r", size);
151
+	printf ("[kdesktop_lock] Obtained %zd stack frames.\n", size);
152 152
 
153 153
 	for (i = 0; i < size; i++) {
154
-		printf ("[kdesktop_lock] %s\n\r", strings[i]);
154
+		printf ("[kdesktop_lock] %s\n", strings[i]);
155 155
 	}
156 156
 
157 157
 	free (strings);
@@ -160,7 +160,7 @@ void print_trace()
160 160
 
161 161
 static void segv_handler(int)
162 162
 {
163
-	printf("[kdesktop_lock] WARNING: A fatal exception was encountered.  Trapping and ignoring it so as not to compromise desktop security...\n\r");
163
+	printf("[kdesktop_lock] WARNING: A fatal exception was encountered.  Trapping and ignoring it so as not to compromise desktop security...\n");
164 164
 	print_trace();
165 165
 	sleep(1);
166 166
 }
@@ -876,7 +876,7 @@ void LockProcess::createSaverWindow()
876 876
         if (!(flags & CWColormap)) {
877 877
             XVisualInfo vinfo;
878 878
             if (!XMatchVisualInfo( x11Display(), x11Screen(), 32, TrueColor, &vinfo )) {
879
-                printf("[ERROR] Unable to locate matching X11 Visual; this application will not function correctly!\n\r");
879
+                printf("[ERROR] Unable to locate matching X11 Visual; this application will not function correctly!\n");
880 880
             }
881 881
             else {
882 882
                 visual = vinfo.visual;
@@ -1139,7 +1139,7 @@ void LockProcess::setVRoot(Window win, Window vr)
1139 1139
     Window top = win;
1140 1140
     while (1) {
1141 1141
         if (XQueryTree(tqt_xdisplay(), top, &rootReturn, &parentReturn, &children, &numChildren) == 0) {
1142
-            printf("[WARNING] XQueryTree() failed!\n\r"); fflush(stdout);
1142
+            printf("[WARNING] XQueryTree() failed!\n"); fflush(stdout);
1143 1143
             break;
1144 1144
         }
1145 1145
         if (children) {
@@ -1953,7 +1953,7 @@ void LockProcess::slotForcePaintBackground()
1953 1953
 	TQPixmap blankPixmap(mRootWidth, mRootHeight);
1954 1954
 	blankPixmap.fill(Qt::black);
1955 1955
 	slotPaintBackground(blankPixmap);
1956
-	printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner.  High system load or possibly a TDE bug!\n\r"); fflush(stdout);
1956
+	printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner.  High system load or possibly a TDE bug!\n"); fflush(stdout);
1957 1957
 }
1958 1958
 
1959 1959
 void LockProcess::slotPaintBackground(const TQPixmap &rpm)
@@ -2720,7 +2720,7 @@ void ControlPipeHandlerObject::run(void) {
2720 2720
 	int display_number = atoi(TQString(XDisplayString(tqt_xdisplay())).replace(":","").ascii());
2721 2721
 
2722 2722
 	if (display_number < 0) {
2723
-		printf("[kdesktop_lock] Warning: unable to create control socket.  Interactive logon modules may not function properly.\n\r");
2723
+		printf("[kdesktop_lock] Warning: unable to create control socket.  Interactive logon modules may not function properly.\n");
2724 2724
 		TQApplication::eventLoop()->exit(-1);
2725 2725
 		return;
2726 2726
 	}
@@ -2750,7 +2750,7 @@ void ControlPipeHandlerObject::run(void) {
2750 2750
 	}
2751 2751
 
2752 2752
 	if (!mParent->mPipeOpen) {
2753
-		printf("[kdesktop_lock] Warning: unable to create control socket '%s'.  Interactive logon modules may not function properly.\n\r", fifo_file);
2753
+		printf("[kdesktop_lock] Warning: unable to create control socket '%s'.  Interactive logon modules may not function properly.\n", fifo_file);
2754 2754
 		TQApplication::eventLoop()->exit(-1);
2755 2755
 		return;
2756 2756
 	}

+ 1
- 1
krootbacking/krootbacking.cpp Voir le fichier

@@ -246,7 +246,7 @@ void KRootBacking::updateBackground( TDESharedPixmap *spm )
246 246
     filename.prepend("/tmp/tde-");
247 247
     filename.append("/krootbacking.png");
248 248
     pm.save(filename, "PNG");
249
-    printf("%s\n\r", filename.ascii()); fflush(stdout);
249
+    printf("%s\n", filename.ascii()); fflush(stdout);
250 250
     exit(0);
251 251
 }
252 252
 

+ 1
- 1
tdm/kfrontend/kgapp.cpp Voir le fichier

@@ -301,7 +301,7 @@ kg_main( const char *argv0 )
301 301
 		iccCommand += iccconfig.readEntry("ICCFile");
302 302
 		iccCommand += TQString(" &");
303 303
 		if (system(iccCommand.ascii()) < 0) {
304
-			printf("WARNING: Unable to execute command \"%s\"\n\r", iccCommand.ascii());
304
+			printf("WARNING: Unable to execute command \"%s\"\n", iccCommand.ascii());
305 305
 		}
306 306
 	}
307 307
 

+ 9
- 9
tdmlib/tdmtsak.h Voir le fichier

@@ -50,7 +50,7 @@ inline int tde_sak_verify_calling_process()
50 50
 
51 51
 	pid_t parentproc = getppid();
52 52
 #ifdef DEBUG
53
-	printf("Parent pid is: %d\n\r", parentproc);
53
+	printf("Parent pid is: %d\n", parentproc);
54 54
 #endif
55 55
 
56 56
 	char parentexecutable[8192];
@@ -60,28 +60,28 @@ inline int tde_sak_verify_calling_process()
60 60
 	parentexecutable[8191] = 0;
61 61
 	procparent = parentexecutable;
62 62
 #ifdef DEBUG
63
-	printf("Parent executable name and full path is: %s\n\r", procparent.ascii());
63
+	printf("Parent executable name and full path is: %s\n", procparent.ascii());
64 64
 #endif
65 65
 
66 66
 	TQString tdeBinaryPath = TQString(KDE_BINDIR "/");
67 67
 #ifdef DEBUG
68
-	printf("The TDE binary path is: %s\n\r", tdeBinaryPath.ascii());
68
+	printf("The TDE binary path is: %s\n", tdeBinaryPath.ascii());
69 69
 #endif
70 70
 
71 71
 	if (!procparent.startsWith(tdeBinaryPath)) {
72
-		printf("Unauthorized path detected in calling process\n\r");
72
+		printf("Unauthorized path detected in calling process\n");
73 73
 		return 2;
74 74
 	}
75 75
 	else {
76 76
 		procparent = procparent.mid(tdeBinaryPath.length());
77 77
 #ifdef DEBUG
78
-		printf("Parent executable name is: %s\n\r", procparent.ascii());
78
+		printf("Parent executable name is: %s\n", procparent.ascii());
79 79
 #endif
80 80
 		if ((procparent == "kdesktop") || (procparent == "kdesktop_lock") || (procparent == "tdm")) {
81 81
 			authorized = true;
82 82
 		}
83 83
 		else if (procparent == "tdeinit") {
84
-			printf("tdeinit detected\n\r");
84
+			printf("tdeinit detected\n");
85 85
 			// A bit more digging is needed to see if this is an authorized process or not
86 86
 			// Get the tdeinit command
87 87
 			char tdeinitcmdline[8192];
@@ -117,8 +117,8 @@ inline int tde_sak_verify_calling_process()
117 117
 			tdeinitenviron[8191] = 0;
118 118
 
119 119
 #ifdef DEBUG
120
-			printf("Called executable name is: %s\n\r", tdeinitCommand.ascii());
121
-			printf("Environment is: %s\n\r", tdeinitEnvironment.ascii());
120
+			printf("Called executable name is: %s\n", tdeinitCommand.ascii());
121
+			printf("Environment is: %s\n", tdeinitEnvironment.ascii());
122 122
 #endif
123 123
 
124 124
 			if ((tdeinitCommand == "kdesktop [tdeinit]") && (tdeinitEnvironment.startsWith(KDE_BINDIR))) {
@@ -129,7 +129,7 @@ inline int tde_sak_verify_calling_process()
129 129
 			}
130 130
 		}
131 131
 		else {
132
-			printf("Unauthorized calling process detected\n\r");
132
+			printf("Unauthorized calling process detected\n");
133 133
 			return 3;
134 134
 		}
135 135
 

+ 1
- 1
tqt3integration/utils/gen.cpp Voir le fichier

@@ -137,7 +137,7 @@ void openInputFile( const TQString& filename )
137 137
     {
138 138
     check( input_file == NULL );
139 139
     input_file = new TQFile( filename );
140
-    printf("[INFO] Reading bindings definitions from file %s\n\r", filename.ascii());
140
+    printf("[INFO] Reading bindings definitions from file %s\n", filename.ascii());
141 141
     if( !input_file->open( IO_ReadOnly ))
142 142
         error();
143 143
     input_stream = new TQTextStream( input_file );

+ 2
- 2
twin/geometry.cpp Voir le fichier

@@ -41,7 +41,7 @@ namespace KWinInternal
41 41
  */
42 42
 void Workspace::desktopResized()
43 43
     {
44
-    //printf("Workspace::desktopResized()\n\r");
44
+    //printf("Workspace::desktopResized()\n");
45 45
     TQRect geom = TDEApplication::desktop()->geometry();
46 46
     NETSize desktop_geometry;
47 47
     desktop_geometry.width = geom.width();
@@ -57,7 +57,7 @@ void Workspace::desktopResized()
57 57
  */
58 58
 void Workspace::kDestopResized()
59 59
     {
60
-    //printf("Workspace::kDesktopResized()\n\r");
60
+    //printf("Workspace::kDesktopResized()\n");
61 61
     TQRect geom = TDEApplication::desktop()->geometry();
62 62
     NETSize desktop_geometry;
63 63
     desktop_geometry.width = geom.width();

+ 4
- 4
twin/kompmgr/kompmgr.c Voir le fichier

@@ -401,7 +401,7 @@ void delete_pid_file()
401 401
 
402 402
 #if WORK_AROUND_FGLRX
403 403
     if ((my_exit_code == 3) && (restartOnSigterm)) {
404
-        printf("kompmgr lost connection to X server, restarting...\n\r"); fflush(stdout);
404
+        printf("kompmgr lost connection to X server, restarting...\n"); fflush(stdout);
405 405
         sleep(1);
406 406
         char me[2048];
407 407
         int chars = readlink("/proc/self/exe", me, sizeof(me));
@@ -443,7 +443,7 @@ void handle_siguser (int sig)
443 443
     if (sig == SIGUSR1) {
444 444
         char newuid[1024];
445 445
 #ifndef NDEBUG
446
-        printf("Enter the new user ID:\n\r"); fflush(stdout);
446
+        printf("Enter the new user ID:\n"); fflush(stdout);
447 447
 #endif
448 448
         char *eof;
449 449
         newuid[0] = '\0';
@@ -451,7 +451,7 @@ void handle_siguser (int sig)
451 451
         eof = fgets(newuid, sizeof(newuid), stdin);
452 452
         uidnum = atoi(newuid);
453 453
 #ifndef NDEBUG
454
-        printf("Setting kompmgr process uid to %d...\n\r", uidnum); fflush(stdout);
454
+        printf("Setting kompmgr process uid to %d...\n", uidnum); fflush(stdout);
455 455
 #endif
456 456
 
457 457
         my_exit_code=4;
@@ -1467,7 +1467,7 @@ paint_all (Display *dpy, XserverRegion region)
1467 1467
 		t = w;
1468 1468
 	}
1469 1469
 #if DEBUG_WINDOWS
1470
-	printf("window count: %d\n\r", window_count);
1470
+	printf("window count: %d\n", window_count);
1471 1471
 #endif
1472 1472
 #if DEBUG_REPAINT
1473 1473
 	printf ("\n");

Chargement…
Annuler
Enregistrer