branches/kdevelop/3.4/languages/cpp/subclassing_template

[Andreas Pakulat]

SVN commit 571841 by apaku:

Fix some errors in the Qt4 templates that produces compile  errors on the resulting files.

Thanks to Glenn Ergeerts for the patch.

mattr: I hope it's not too late to get this into beta2...

CCMAIL: kdevelop-devel at kdevelop.org

M    subclassing_template/subclass_qt4_template.cpp
M    subclassing_template/subclass_qt4_template.h


 M  +2 -2      subclass_qt4_template.cpp  
 M  +1 -1      subclass_qt4_template.h  


--- branches/kdevelop/3.4/languages/cpp/subclassing_template/subclass_qt4_template.cpp #571840:571841
@@ -2,8 +2,8 @@
 
 #include "$NEWFILENAMELC$.h"
 
-$NEWCLASS$::$NEWCLASS$(QWidget* parent, WFlags fl)
-: $QTBASECLASS$( parent, fl ), Ui::$BASECLASS$(parent,fl)
+$NEWCLASS$::$NEWCLASS$(QWidget* parent, Qt::WFlags fl)
+: $QTBASECLASS$( parent, fl )
 {
 }
 
--- branches/kdevelop/3.4/languages/cpp/subclassing_template/subclass_qt4_template.h #571840:571841
@@ -9,7 +9,7 @@
   Q_OBJECT
 
 public:
-  $NEWCLASS$(QWidget* parent = 0, WFlags fl = 0 );
+  $NEWCLASS$(QWidget* parent = 0, Qt::WFlags fl = 0 );
   ~$NEWCLASS$();
   /*$PUBLIC_FUNCTIONS$*/