Rename TDE-specific atoms to avoid stomping on KDE atom names

tdecore/twin.cpp

@@ -77,20 +77,20 @@ static void twin_net_create_atoms() {
 	names[n++] = "_NET_WM_CONTEXT_HELP";
 
 	atoms[n] = &kde_wm_change_state;
-	names[n++] = "_KDE_WM_CHANGE_STATE";
-        
+	names[n++] = "_TDE_WM_CHANGE_STATE";
+
         atoms[n] = &kde_wm_window_opacity;
-        names[n++] = (char*) "_KDE_WM_WINDOW_OPACITY";
+        names[n++] = (char*) "_TDE_WM_WINDOW_OPACITY";
 
         atoms[n] = &kde_wm_window_shadow;
-        names[n++] = (char*) "_KDE_WM_WINDOW_SHADOW";
+        names[n++] = (char*) "_TDE_WM_WINDOW_SHADOW";
 
         char net_wm_cm_name[ 100 ];
         sprintf( net_wm_cm_name, "_NET_WM_CM_S%d", DefaultScreen( tqt_xdisplay()));
         atoms[n] = &net_wm_cm;
         names[n++] = net_wm_cm_name;
 
-	// we need a const_cast for the shitty X API
+	// we need a const_cast for the horrible X API
 	XInternAtoms( tqt_xdisplay(), const_cast<char**>(names), n, false, atoms_return );
 	for (int i = 0; i < n; i++ )
 	    *atoms[i] = atoms_return[i];

tdeui/kdialog.cpp

@@ -42,7 +42,7 @@
 
 #include "config.h"
 #ifdef Q_WS_X11
-#include <netwm.h> 
+#include <netwm.h>
 #endif
 
 const int KDialog::mMarginSize = 11;
@@ -401,7 +401,7 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent)
 {
 	// Signal that we do not want any window controls to be shown at all
 	Atom kde_wm_system_modal_notification;
-	kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
+	kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_TDE_WM_MODAL_SYS_NOTIFICATION", False);
 	XChangeProperty(tqt_xdisplay(), winId(), kde_wm_system_modal_notification, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
 
 	TQVBoxLayout* vbox = new TQVBoxLayout( this );