From 539a1fd1ae6290cc3eec745226c0ce45b02c1545 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/kdevelop@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 languages/cpp/app_templates/kateplugin2/plugin_app.cpp     | 4 ++--
 languages/cpp/app_templates/kateplugin2/plugin_app.h       | 2 +-
 languages/cpp/app_templates/kconfig35/appview_base.ui      | 2 +-
 languages/cpp/app_templates/kconfig35/prefs-base.ui        | 2 +-
 languages/cpp/app_templates/kde4app/kapp4view_base.ui      | 2 +-
 languages/cpp/app_templates/kde4app/prefs_base.ui          | 2 +-
 languages/cpp/app_templates/kdevpart/globalconfigbase.ui   | 2 +-
 languages/cpp/app_templates/kdevpart/projectconfigbase.ui  | 2 +-
 languages/cpp/app_templates/kdevpart2/globalconfigbase.ui  | 2 +-
 languages/cpp/app_templates/kdevpart2/projectconfigbase.ui | 2 +-
 languages/cpp/app_templates/khello2/widgetbase.ui          | 2 +-
 languages/cpp/app_templates/kmake/mainview.ui              | 2 +-
 languages/cpp/app_templates/kofficepart/kopart_factory.cpp | 6 +++---
 languages/cpp/app_templates/kofficepart/kopart_factory.h   | 2 +-
 languages/cpp/app_templates/kofficepart/kopart_part.cpp    | 6 +++---
 languages/cpp/app_templates/kofficepart/kopart_part.h      | 4 ++--
 languages/cpp/app_templates/kpartapp/app_part.cpp          | 8 ++++----
 languages/cpp/app_templates/kpartapp/app_part.h            | 4 ++--
 languages/cpp/app_templates/kscons_kmdi/app_part.cpp       | 4 ++--
 languages/cpp/app_templates/kscons_kmdi/app_part.h         | 2 +-
 languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp    | 4 ++--
 languages/cpp/app_templates/kscons_kmdi/appkmdiView.h      | 2 +-
 languages/cpp/app_templates/kscons_kmdi/prefs.ui           | 2 +-
 languages/cpp/app_templates/kscons_kxt/appview_base.ui     | 2 +-
 languages/cpp/app_templates/kscons_kxt/prefs-base.ui       | 2 +-
 languages/cpp/app_templates/kscreensaver/kscreensaverui.ui | 4 ++--
 languages/cpp/app_templates/kxt/appview_base.ui            | 2 +-
 languages/cpp/app_templates/kxt/prefs-base.ui              | 2 +-
 languages/cpp/app_templates/opieapp/examplebase.ui         | 2 +-
 languages/cpp/app_templates/qtopiaapp/examplebase.ui       | 2 +-
 30 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'languages/cpp/app_templates')

diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 9ee7b8b5..1670f252 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -114,8 +114,8 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p )
 /**
  * %{APPNAME}ConfigPage
  */
-%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *tqparentWidget /*= 0L*/)
-    : Kate::PluginConfigPage( tqparentWidget )
+%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *parentWidget /*= 0L*/)
+    : Kate::PluginConfigPage( parentWidget )
 {
     TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" );
     lo->setSpacing(KDialogBase::spacingHint());
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h
index 3082884e..3550a344 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h
@@ -71,7 +71,7 @@ class %{APPNAME}ConfigPage : public Kate::PluginConfigPage
     friend class KatePlugin%{APPNAME};
 
 public:
-    %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *tqparentWidget = 0L);
+    %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L);
     ~%{APPNAME}ConfigPage ();
 
     /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ).  */
diff --git a/languages/cpp/app_templates/kconfig35/appview_base.ui b/languages/cpp/app_templates/kconfig35/appview_base.ui
index 5852f806..3ee8d513 100644
--- a/languages/cpp/app_templates/kconfig35/appview_base.ui
+++ b/languages/cpp/app_templates/kconfig35/appview_base.ui
@@ -29,5 +29,5 @@
 </widget>
 </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/kconfig35/prefs-base.ui
index 8c8b9012..46a35473 100644
--- a/languages/cpp/app_templates/kconfig35/prefs-base.ui
+++ b/languages/cpp/app_templates/kconfig35/prefs-base.ui
@@ -120,7 +120,7 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/cpp/app_templates/kde4app/kapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
index 92a83f43..c3780092 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view_base.ui
+++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui
@@ -206,7 +206,7 @@
    </item>
   </tqlayout>
  </widget>
- <tqlayoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections/>
diff --git a/languages/cpp/app_templates/kde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui
index 98bf5f19..f1e5fdfb 100644
--- a/languages/cpp/app_templates/kde4app/prefs_base.ui
+++ b/languages/cpp/app_templates/kde4app/prefs_base.ui
@@ -138,7 +138,7 @@ p, li { white-space: pre-wrap; }
    </item>
   </tqlayout>
  </widget>
- <tqlayoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <customwidgets>
   <customwidget>
diff --git a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui
index 7cba9a36..588f9dc9 100644
--- a/languages/cpp/app_templates/kdevpart/globalconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui
index 140e8df4..30849e54 100644
--- a/languages/cpp/app_templates/kdevpart/projectconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
index 7cba9a36..588f9dc9 100644
--- a/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
index 140e8df4..30849e54 100644
--- a/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
+++ b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui
@@ -16,5 +16,5 @@
         <string>%{APPNAME}</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/khello2/widgetbase.ui b/languages/cpp/app_templates/khello2/widgetbase.ui
index 4540c922..365f4cf2 100644
--- a/languages/cpp/app_templates/khello2/widgetbase.ui
+++ b/languages/cpp/app_templates/khello2/widgetbase.ui
@@ -48,5 +48,5 @@
 <Q_SLOTS>
     <slot>button_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kmake/mainview.ui b/languages/cpp/app_templates/kmake/mainview.ui
index 2aefef82..94fb52fa 100644
--- a/languages/cpp/app_templates/kmake/mainview.ui
+++ b/languages/cpp/app_templates/kmake/mainview.ui
@@ -72,5 +72,5 @@
 <Q_SLOTS>
     <slot>slotHelloButtonClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
index 034e2fb3..d020ed5e 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
@@ -37,14 +37,14 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L;
     s_global = 0L;
 }
 
-KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
 {
     // If classname is "KoDocument", our host is a koffice application
     // otherwise, the host wants us as a simple part, so switch to readonly and single view.
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    %{APPNAME}Part *part = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
+    %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
       part->setReadWrite( false );
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h
index 149b4b50..b0f934d9 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h
@@ -19,7 +19,7 @@ public:
     %{APPNAME}Factory( TQObject* tqparent = 0, const char* name = 0 );
     ~%{APPNAME}Factory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
+    virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp
index 389fb431..fe8c0cca 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp
@@ -8,12 +8,12 @@
 
 #include <tqpainter.h>
 
-%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-    : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
+%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+    : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
 {
 }
 
-bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* tqparentWidget )
+bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget )
 {
     // If nothing is loaded, do initialize here
     return TRUE;
diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h
index 0ec011ae..fc67a523 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_part.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_part.h
@@ -13,11 +13,11 @@ class %{APPNAME}Part : public KoDocument
     Q_OBJECT
   TQ_OBJECT
 public:
-    %{APPNAME}Part( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
 
     virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 );
 
-    virtual bool initDoc( InitDocFlags flags, TQWidget* tqparentWidget = 0 );
+    virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 );
 
     virtual bool loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store );
     virtual bool loadXML( TQIODevice *, const TQDomDocument & );
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 45a8116a..479a6782 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -12,7 +12,7 @@
 #include <tqtextstream.h>
 #include <tqmultilineedit.h>
 
-%{APPNAME}Part::%{APPNAME}Part( TQWidget *tqparentWidget, const char *widgetName,
+%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName,
                                   TQObject *tqparent, const char *name )
     : KParts::ReadWritePart(tqparent, name)
 {
@@ -20,7 +20,7 @@
     setInstance( %{APPNAME}PartFactory::instance() );
 
     // this should be your custom internal widget
-    m_widget = new TQMultiLineEdit( tqparentWidget, widgetName );
+    m_widget = new TQMultiLineEdit( parentWidget, widgetName );
 
     // notify the part that this is our internal widget
     setWidget(m_widget);
@@ -164,12 +164,12 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L;
     s_instance = 0L;
 }
 
-KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
                                                         TQObject *tqparent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    %{APPNAME}Part* obj = new %{APPNAME}Part( tqparentWidget, widgetName, tqparent, name );
+    %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h
index 8d5417ad..3a481c5c 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.h
+++ b/languages/cpp/app_templates/kpartapp/app_part.h
@@ -26,7 +26,7 @@ public:
     /**
      * Default constructor
      */
-    %{APPNAME}Part(TQWidget *tqparentWidget, const char *widgetName,
+    %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName,
                     TQObject *tqparent, const char *name);
 
     /**
@@ -75,7 +75,7 @@ class %{APPNAME}PartFactory : public KParts::Factory
 public:
     %{APPNAME}PartFactory();
     virtual ~%{APPNAME}PartFactory();
-    virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+    virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
                                             TQObject *tqparent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
index 1f27cee4..0818d856 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
@@ -17,7 +17,7 @@
 typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory;
 K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory );
 
-%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *tqparentWidget, const char *widgetName, 
+%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, 
 		TQObject *tqparent, const char *name, const TQStringList & /*args*/)
     : KParts::ReadWritePart(tqparent)
 {
@@ -25,7 +25,7 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory );
     setInstance( %{APPNAMELC}PartFactory::instance() );
 
     // this should be your custom internal widget
-    m_widget = new TQMultiLineEdit( tqparentWidget, widgetName );
+    m_widget = new TQMultiLineEdit( parentWidget, widgetName );
 
     // notify the part that this is our internal widget
     setWidget(m_widget);
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h
index 39509adf..fabeedbc 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.h
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h
@@ -28,7 +28,7 @@ public:
     /**
      * Default constructor
      */
-    %{APPNAMELC}Part(TQWidget *tqparentWidget, const char *widgetName,
+    %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName,
                     TQObject *tqparent, const char *name, const TQStringList & /*args*/);
 
     /**
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
index 232d6b44..006b844e 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
@@ -13,8 +13,8 @@
 #include "%{APPNAMELC}kmdiView.h"
 
 
-	%{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *tqparentWidget, const char *name )
-: KMdiChildView( tqparentWidget, name )
+	%{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name )
+: KMdiChildView( parentWidget, name )
 {
 	m_part = NULL;
 
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
index 31167035..8890fb59 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
@@ -17,7 +17,7 @@ class %{APPNAMELC}kmdiView : public KMdiChildView
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		%{APPNAMELC}kmdiView( TQWidget *tqparentWidget=0L, const char *name=0L );
+		%{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L );
 		virtual ~%{APPNAMELC}kmdiView();
 
 		KParts::ReadWritePart *part() { return m_part; }
diff --git a/languages/cpp/app_templates/kscons_kmdi/prefs.ui b/languages/cpp/app_templates/kscons_kmdi/prefs.ui
index 8b3346de..7830280b 100644
--- a/languages/cpp/app_templates/kscons_kmdi/prefs.ui
+++ b/languages/cpp/app_templates/kscons_kmdi/prefs.ui
@@ -26,5 +26,5 @@
 </widget>
 </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kscons_kxt/appview_base.ui b/languages/cpp/app_templates/kscons_kxt/appview_base.ui
index 4604ca4b..41096b1b 100644
--- a/languages/cpp/app_templates/kscons_kxt/appview_base.ui
+++ b/languages/cpp/app_templates/kscons_kxt/appview_base.ui
@@ -31,5 +31,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
index 59403c40..a343c6cf 100644
--- a/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kscons_kxt/prefs-base.ui
@@ -122,7 +122,7 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
index da84ab28..e83bcda9 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
@@ -74,6 +74,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/languages/cpp/app_templates/kxt/appview_base.ui b/languages/cpp/app_templates/kxt/appview_base.ui
index 5852f806..3ee8d513 100644
--- a/languages/cpp/app_templates/kxt/appview_base.ui
+++ b/languages/cpp/app_templates/kxt/appview_base.ui
@@ -29,5 +29,5 @@
 </widget>
 </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui
index 8c8b9012..46a35473 100644
--- a/languages/cpp/app_templates/kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kxt/prefs-base.ui
@@ -120,7 +120,7 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui
index 1243c341..90d39d17 100644
--- a/languages/cpp/app_templates/opieapp/examplebase.ui
+++ b/languages/cpp/app_templates/opieapp/examplebase.ui
@@ -45,5 +45,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/qtopiaapp/examplebase.ui b/languages/cpp/app_templates/qtopiaapp/examplebase.ui
index 1243c341..90d39d17 100644
--- a/languages/cpp/app_templates/qtopiaapp/examplebase.ui
+++ b/languages/cpp/app_templates/qtopiaapp/examplebase.ui
@@ -45,5 +45,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
-- 
cgit v1.2.1