4 files changed, 5 insertions, 5 deletions
diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui
index fd5fde63..1477a193 100644
--- a/kscd/configWidgetUI.ui
+++ b/kscd/configWidgetUI.ui
@@ -449,7 +449,7 @@
     <slot>kcfg_DigitalPlayback_toggled( bool )</slot>
     <slot>kcfg_SelectEncoding_toggled(bool)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kfontrequester.h</includehint>
diff --git a/kscd/kscdmagic/xlib.c b/kscd/kscdmagic/xlib.c
index 6e1c1ed2..530336cf 100644
--- a/kscd/kscdmagic/xlib.c
+++ b/kscd/kscdmagic/xlib.c
@@ -325,7 +325,7 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib
     xd->attr_tqmask = CWBackPixel | CWBorderPixel | CWEventMask;
     xd->classX = InputOutput;
     xd->xcolor.n = 0;
-    xd->tqparent_window = RootWindow(xd->display, xd->screen);
+    xd->parent_window = RootWindow(xd->display, xd->screen);
     defaultvisual = DefaultVisual(xd->display, xd->screen);
     xd->params = params;
     if (!params->usedefault) {
@@ -403,7 +403,7 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib
     xd->lasty = 0;
     xd->font_struct = (XFontStruct *) NULL;
 
-    xd->window = XCreateWindow(xd->display, xd->tqparent_window, xHint, yHint,
+    xd->window = XCreateWindow(xd->display, xd->parent_window, xHint, yHint,
 			      xd->width, xd->height, xd->border_width,
 				vis.depth, xd->classX, xd->visual,
 				xd->attr_tqmask, xd->attributes);
diff --git a/kscd/kscdmagic/xlib.h b/kscd/kscdmagic/xlib.h
index fa079775..00b6242e 100644
--- a/kscd/kscdmagic/xlib.h
+++ b/kscd/kscdmagic/xlib.h
@@ -58,7 +58,7 @@ typedef struct {
     int privatecolormap;
     xlibparam *params;
     Display *display;
-    Window tqparent_window;
+    Window parent_window;
     Window window;
     unsigned int width, height;
     unsigned int border_width;
diff --git a/kscd/panel.ui b/kscd/panel.ui
index 58bf1e41..43fd739a 100644
--- a/kscd/panel.ui
+++ b/kscd/panel.ui
@@ -464,5 +464,5 @@
     <slot>ejectClicked()</slot>
     <slot returnType="bool">nextClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>