summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-07 13:24:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-07 13:24:10 -0600
commita829bcdc533e154000803d517200d32fe762e85c (patch)
tree1590e1ec33f4b581d1a77b700dc0dc78fbc45fa0
parent82df3b0afc1af1ca9b5a61447f4581aa26f85093 (diff)
downloadtqt3-a829bcdc533e154000803d517200d32fe762e85c.tar.gz
tqt3-a829bcdc533e154000803d517200d32fe762e85c.zip
Automated conversion from Qt3
-rw-r--r--src/kernel/ntqwidget.h2
-rw-r--r--src/kernel/qwidget.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index 383ffc8e0..8a5bcf775 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -139,7 +139,7 @@ class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice
Q_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false )
public:
- Q_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0 );
+ Q_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0, NFlags n=0 );
~TQWidget();
WId winId() const;
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index 7833f14f6..9bcf665b0 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -847,7 +847,7 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
/*!
Constructs a widget which is a child of \a parent, with the name
- \a name and widget flags set to \a f.
+ \a name, widget flags set to \a f, and NETWM flags set to \a n.
If \a parent is 0, the new widget becomes a top-level window. If
\a parent is another widget, this widget becomes a child window
@@ -877,7 +877,7 @@ TQSize qt_naturalWidgetSize( TQWidget *w ) {
\endcode
*/
-TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f )
+TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n )
: TQObject( parent, name ), TQPaintDevice( TQInternal::Widget )
{
#if defined(QT_CHECK_STATE) && !defined(Q_WS_WIN)
@@ -893,7 +893,7 @@ TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f )
winid = 0; // default attributes
widget_state = 0;
widget_flags = f;
- netwm_flags = 0;
+ netwm_flags = n;
focus_policy = 0;
own_font = 0;
own_palette = 0;