From 0d5a05983c0c2ba7a51bdeb1688dc232bacfa8ff Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 9 Jul 2011 02:23:29 +0000
Subject: Remove the tq in front of these incorrectly TQt4-converted
 methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...]
 tqmask[...] tqlayout[...] tqalignment[...]

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmplayer@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/npplayer.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/npplayer.c')

diff --git a/src/npplayer.c b/src/npplayer.c
index bb0dbd3..d338ec4 100644
--- a/src/npplayer.c
+++ b/src/npplayer.c
@@ -58,7 +58,7 @@ static gchar *callback_path;
 static GModule *library;
 static GtkWidget *xembed;
 static Window socket_id;
-static Window tqparent_id;
+static Window parent_id;
 static int top_w, top_h;
 static int update_dimension_timer;
 static int stdin_read_watch;
@@ -1354,19 +1354,19 @@ static void windowCreatedEvent (GtkWidget *w, gpointer d) {
     (void)d;
     print ("windowCreatedEvent\n");
     socket_id = gtk_socket_get_id (GTK_SOCKET (xembed));
-    if (tqparent_id) {
+    if (parent_id) {
         print ("windowCreatedEvent %p\n", GTK_PLUG (w)->socket_window);
         if (!GTK_PLUG (w)->socket_window)
-            gtk_plug_construct (GTK_PLUG (w), tqparent_id);
+            gtk_plug_construct (GTK_PLUG (w), parent_id);
         gdk_window_reparent( w->window,
                 GTK_PLUG (w)->socket_window
                     ? GTK_PLUG (w)->socket_window
-                    : gdk_window_foreign_new (tqparent_id),
+                    : gdk_window_foreign_new (parent_id),
                 0, 0);
         gtk_widget_show_all (w);
-        /*XRetqparentWindow (gdk_x11_drawable_get_xdisplay (w->window),
+        /*XReparentWindow (gdk_x11_drawable_get_xdisplay (w->window),
                 gdk_x11_drawable_get_xid (w->window),
-                tqparent_id,
+                parent_id,
                 0, 0);*/
     }
     if (!callback_service) {
@@ -1425,7 +1425,7 @@ static gboolean initPlayer (void * p) {
     (void)p;
 
     window = callback_service
-        ? gtk_plug_new (tqparent_id)
+        ? gtk_plug_new (parent_id)
         : gtk_window_new (GTK_WINDOW_TOPLEVEL);
     g_signal_connect (G_OBJECT (window), "delete_event",
             G_CALLBACK (windowCloseEvent), NULL);
@@ -1446,7 +1446,7 @@ static gboolean initPlayer (void * p) {
 
     gtk_container_add (GTK_CONTAINER (window), xembed);
 
-    if (!tqparent_id) {
+    if (!parent_id) {
         gtk_widget_set_size_request (window, 440, 330);
         gtk_widget_show_all (window);
     } else {
@@ -1518,7 +1518,7 @@ int main (int argc, char **argv) {
         } else if (!strcmp (argv[i], "-m") && ++i < argc) {
             mimetype = g_strdup (argv[i]);
         } else if (!strcmp (argv [i], "-wid") && ++i < argc) {
-            tqparent_id = strtol (argv[i], 0L, 10);
+            parent_id = strtol (argv[i], 0L, 10);
         } else
             object_url = g_strdup (argv[i]);
     }
-- 
cgit v1.2.1