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

3 files changed, 32 insertions, 32 deletions

diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp
index e555115a..6a83681e 100644
--- a/parts/snippet/snippet_widget.cpp
+++ b/parts/snippet/snippet_widget.cpp
@@ -672,9 +672,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   dlg.setCaption(i18n("Enter Values for Variables"));
 
   TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
-  TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
-  TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
-  TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutBtn");
+  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
+  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
+  TQGridLayout * layoutBtn = new TQGridLayout( 0, 1, 1, 0, 6, "layoutBtn");
 
   KTextEdit *te = NULL;
   TQLabel * labTop = NULL;
@@ -684,8 +684,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   labTop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          labTop->sizePolicy().hasHeightForWidth() ) );
   labTop->setText(i18n("Enter the replacement values for these variables:"));
-  tqlayoutTop->addWidget(labTop, 0, 0);
-  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
+  layoutTop->addWidget(labTop, 0, 0);
+  tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
 
 
   int i = 0;                                           //walk through the variable map and add
@@ -696,10 +696,10 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
     cb = new TQCheckBox( &dlg, "cbVar" );
     cb->setChecked( FALSE );
     cb->setText(it.key());
-    tqlayoutVar->addWidget( cb, i ,0, TQt::AlignTop );
+    layoutVar->addWidget( cb, i ,0, TQt::AlignTop );
 
     te = new KTextEdit( &dlg, "teVar" );
-    tqlayoutVar->addWidget( te, i, 1, TQt::AlignTop );
+    layoutVar->addWidget( te, i, 1, TQt::AlignTop );
 
     if ((*mapSave)[it.key()].length() > 0) {
       cb->setChecked( TRUE );
@@ -716,22 +716,22 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
 
     i++;
   }
-  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
   btn1->setText(i18n("&Cancel"));
   btn1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn1->sizePolicy().hasHeightForWidth() ) );
-  tqlayoutBtn->addWidget( btn1, 0, 0 );
+  layoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" );
   btn2->setText(i18n("&Apply"));
   btn2->setDefault( TRUE );
   btn2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0,
                          btn2->sizePolicy().hasHeightForWidth() ) );
-  tqlayoutBtn->addWidget( btn2, 0, 1 );
+  layoutBtn->addWidget( btn2, 0, 1 );
 
-  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
   // --END-- building a dynamic dialog
 
   //connect the buttons to the TQDialog default slots
@@ -763,8 +763,8 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
     }
     bReturn = true;
 
-    iBasicHeight = dlg.tqgeometry().height() - tqlayoutVar->tqgeometry().height();
-    iOneHeight = tqlayoutVar->tqgeometry().height() / mapVar2Te.count();
+    iBasicHeight = dlg.tqgeometry().height() - layoutVar->tqgeometry().height();
+    iOneHeight = layoutVar->tqgeometry().height() / mapVar2Te.count();
     iWidth = dlg.tqgeometry().width();
   }
 
@@ -777,9 +777,9 @@ bool SnippetWidget::showMultiVarDialog(TQMap<TQString, TQString> * map, TQMap<TQ
   for (it2 = mapVar2Cb.begin(); it2 != mapVar2Cb.end(); ++it2)
     delete it2.data();
   mapVar2Cb.clear();
-  delete tqlayoutTop;
-  delete tqlayoutVar;
-  delete tqlayoutBtn;
+  delete layoutTop;
+  delete layoutVar;
+  delete layoutBtn;
   delete tqlayout;
 
   if (i==0) //if nothing happened this means, that there are no variables to translate
@@ -801,18 +801,18 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   dlg.setCaption(i18n("Enter Values for Variables"));
 
   TQGridLayout * tqlayout = new TQGridLayout( &dlg, 1, 1, 11, 6, "tqlayout");
-  TQGridLayout * tqlayoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutTop");
-  TQGridLayout * tqlayoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayoutVar");
-  TQGridLayout * tqlayoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "tqlayoutBtn");
+  TQGridLayout * layoutTop = new TQGridLayout( 0, 1, 1, 0, 6, "layoutTop");
+  TQGridLayout * layoutVar = new TQGridLayout( 0, 1, 1, 0, 6, "layoutVar");
+  TQGridLayout * layoutBtn = new TQGridLayout( 0, 2, 1, 0, 6, "layoutBtn");
 
   KTextEdit *te = NULL;
   TQLabel * labTop = NULL;
   TQCheckBox * cb = NULL;
 
   labTop = new TQLabel( &dlg, "label" );
-  tqlayoutTop->addWidget(labTop, 0, 0);
+  layoutTop->addWidget(labTop, 0, 0);
   labTop->setText(i18n("Enter the replacement values for %1:").tqarg( var ));
-  tqlayout->addMultiCellLayout( tqlayoutTop, 0, 0, 0, 1 );
+  tqlayout->addMultiCellLayout( layoutTop, 0, 0, 0, 1 );
 
 
   cb = new TQCheckBox( &dlg, "cbVar" );
@@ -820,8 +820,8 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   cb->setText(i18n( "Make value &default" ));
 
   te = new KTextEdit( &dlg, "teVar" );
-  tqlayoutVar->addWidget( te, 0, 1, TQt::AlignTop);
-  tqlayoutVar->addWidget( cb, 1, 1, TQt::AlignTop);
+  layoutVar->addWidget( te, 0, 1, TQt::AlignTop);
+  layoutVar->addWidget( cb, 1, 1, TQt::AlignTop);
   if ((*mapSave)[var].length() > 0) {
     cb->setChecked( TRUE );
     te->setText((*mapSave)[var]);
@@ -832,18 +832,18 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
                             "If you use the same variable later, even in another snippet, the value entered to the right "
                             "will be the default value for that variable.") );
 
-  tqlayout->addMultiCellLayout( tqlayoutVar, 1, 1, 0, 1 );
+  tqlayout->addMultiCellLayout( layoutVar, 1, 1, 0, 1 );
 
   KPushButton * btn1 = new KPushButton( &dlg, "pushButton1" );
   btn1->setText(i18n("&Cancel"));
-  tqlayoutBtn->addWidget( btn1, 0, 0 );
+  layoutBtn->addWidget( btn1, 0, 0 );
 
   KPushButton * btn2 = new KPushButton( &dlg, "pushButton2" );
   btn2->setText(i18n("&Apply"));
   btn2->setDefault( TRUE );
-  tqlayoutBtn->addWidget( btn2, 0, 1 );
+  layoutBtn->addWidget( btn2, 0, 1 );
 
-  tqlayout->addMultiCellLayout( tqlayoutBtn, 2, 2, 0, 1 );
+  tqlayout->addMultiCellLayout( layoutBtn, 2, 2, 0, 1 );
   te->setFocus();
   // --END-- building a dynamic dialog
 
@@ -872,9 +872,9 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri
   delete labTop;
   delete btn1;
   delete btn2;
-  delete tqlayoutTop;
-  delete tqlayoutVar;
-  delete tqlayoutBtn;
+  delete layoutTop;
+  delete layoutVar;
+  delete layoutBtn;
   delete tqlayout;
 
   return strReturn;
diff --git a/parts/snippet/snippetdlg.ui b/parts/snippet/snippetdlg.ui
index acf7841b..55bd67ad 100644
--- a/parts/snippet/snippetdlg.ui
+++ b/parts/snippet/snippetdlg.ui
@@ -203,7 +203,7 @@
 <Q_SLOTS>
     <slot>slotHelp()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/parts/snippet/snippetsettingsbase.ui b/parts/snippet/snippetsettingsbase.ui
index 3d2b6a39..f5c56b99 100644
--- a/parts/snippet/snippetsettingsbase.ui
+++ b/parts/snippet/snippetsettingsbase.ui
@@ -221,7 +221,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>