[brlcad-commits] SF.net SVN: brlcad:[56058] brlcad/trunk/src/libdm/dm-qt.cpp

[<vla...@us...>]

Revision: 56058
          http://sourceforge.net/p/brlcad/code/56058
Author:   vladbogo
Date:     2013-07-15 17:48:18 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
Remove trailing ws and other minor changes.

Modified Paths:
--------------
    brlcad/trunk/src/libdm/dm-qt.cpp

Modified: brlcad/trunk/src/libdm/dm-qt.cpp
===================================================================
--- brlcad/trunk/src/libdm/dm-qt.cpp	2013-07-15 11:50:52 UTC (rev 56057)
+++ brlcad/trunk/src/libdm/dm-qt.cpp	2013-07-15 17:48:18 UTC (rev 56058)
@@ -39,7 +39,7 @@
 
 /*
  * Q T _ C L O S E
- * 
+ *
  * Release the display manager
  */
 HIDDEN int
@@ -52,7 +52,7 @@
 	privars->qapp->quit();
     if (pubvars->xtkwin)
 	Tk_DestroyWindow(pubvars->xtkwin);
-    
+
     bu_vls_free(&dmp->dm_pathName);
     bu_vls_free(&dmp->dm_tkName);
     bu_vls_free(&dmp->dm_dName);
@@ -411,7 +411,7 @@
 QTkMainWindow::QTkMainWindow(WId win)
 :QWidget()
 {
-    QWidget::create(win, false, true);
+    create(win, false, true);
 }
 
 
@@ -435,7 +435,7 @@
 
     struct dm_xvars *pubvars = NULL;
     struct qt_vars *privars = NULL;
-    
+
     if (argc < 0 || !argv)
 	return DM_NULL;
 
@@ -563,11 +563,13 @@
 
     privars->qapp = new QApplication(argc, argv);
 
-    QTkMainWindow *w = new QTkMainWindow(pubvars->win);
-    w->show();
+    QTkMainWindow *win = new QTkMainWindow((WId)pubvars->win);
+    win->show();
 
     Tk_MapWindow(pubvars->xtkwin);
 
+
+    bu_log("Tk: %ld Qt: %ld\n", pubvars->win, win->winId());
     bu_log("qt_open called\n");
     return dmp;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.