Rename obsolete tq methods to standard names

13 files changed, 40 insertions, 40 deletions

diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui
index df9a6bd3..f206907b 100644
--- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui
+++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui
@@ -91,7 +91,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout38</cstring>
+                            <cstring>layout38</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -259,7 +259,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout33</cstring>
+                                    <cstring>layout33</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -461,7 +461,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
                             </widget>
                             <widget class="TQLayoutWidget" row="2" column="1">
                                 <property name="name">
-                                    <cstring>tqlayout39</cstring>
+                                    <cstring>layout39</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -954,7 +954,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout56</cstring>
+                            <cstring>layout56</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -1044,7 +1044,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout55</cstring>
+                                    <cstring>layout55</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -1202,7 +1202,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
                     </widget>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout55</cstring>
+                            <cstring>layout55</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -4776,7 +4776,7 @@ Only change something if you know what you are doing.</string>
                                         </widget>
                                         <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
                                             <property name="name">
-                                                <cstring>tqunicodeChk</cstring>
+                                                <cstring>unicodeChk</cstring>
                                             </property>
                                             <property name="text">
                                                 <string>U&amp;nicode</string>
@@ -8243,7 +8243,7 @@ This is only available if the SSL libraries have been compiled on your system an
     <tabstop>logonDriveEdit</tabstop>
     <tabstop>logonPathUrlRq</tabstop>
     <tabstop>logonHomeUrlRq</tabstop>
-    <tabstop>tqunicodeChk</tabstop>
+    <tabstop>unicodeChk</tabstop>
     <tabstop>displayCharsetEdit</tabstop>
     <tabstop>unixCharsetEdit</tabstop>
     <tabstop>dosCharsetEdit</tabstop>
diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
index 332f063c..57c96424 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
@@ -919,7 +919,7 @@ void KcmSambaConf::loadCharset(SambaShare* )
   _dictMngr->add("character set", _interface->characterSetEdit);
   _dictMngr->add("valid chars", _interface->validCharsEdit);
   
-  _dictMngr->add("tqunicode",_interface->tqunicodeChk);
+  _dictMngr->add("unicode",_interface->unicodeChk);
 }
 
 void KcmSambaConf::loadWinbind(SambaShare* )
diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
index 0ba2082b..fa601072 100644
--- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
+++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp
@@ -227,14 +227,14 @@ void PrinterDlgImpl::printersChkToggled(bool b)
 		pix.setMask(mask);
 
     printerPixLbl->setPixmap(pix);
-		pixFrame->tqlayout()->setMargin( 2 );
+		pixFrame->layout()->setMargin( 2 );
   }
 	else
   {
   	shareNameEdit->setEnabled(true);
 		shareNameEdit->setText( _share->getName() );
 		printerPixLbl->setPixmap(DesktopIcon("printer1"));
-		pixFrame->tqlayout()->setMargin( 11 );
+		pixFrame->layout()->setMargin( 11 );
   }
 }
 
diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui
index 52971d94..ba600d17 100644
--- a/filesharing/advanced/kcm_sambaconf/share.ui
+++ b/filesharing/advanced/kcm_sambaconf/share.ui
@@ -735,7 +735,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout18</cstring>
+                                    <cstring>layout18</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -799,7 +799,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout52</cstring>
+                                    <cstring>layout52</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -2453,7 +2453,7 @@ Only change something if you know what you are doing.</string>
                                         </widget>
                                         <widget class="TQLayoutWidget" row="0" column="0">
                                             <property name="name">
-                                                <cstring>tqlayout9</cstring>
+                                                <cstring>layout9</cstring>
                                             </property>
                                             <hbox>
                                                 <property name="name">
diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
index 46a8bc8b..00181eaa 100644
--- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
+++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp
@@ -43,7 +43,7 @@ SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* parent)
   : TQWidget(parent,"configWidget")
 {  
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this,5);
+  TQVBoxLayout *layout = new TQVBoxLayout(this,5);
 
   TQLabel *lbl = new TQLabel(i18n("<p>The SAMBA configuration file <strong>'smb.conf'</strong>" \
                                 " could not be found;</p>" \
@@ -59,9 +59,9 @@ SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* parent)
   hbox->addStretch();
   hbox->addWidget(btn);
 
-  tqlayout->addWidget(lbl);
-  tqlayout->addLayout(hbox);
-  tqlayout->addStretch();
+  layout->addWidget(lbl);
+  layout->addLayout(hbox);
+  layout->addStretch();
 }
 
 void SmbConfConfigWidget::btnPressed() {
diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui
index 4fa41052..d3775c32 100644
--- a/filesharing/advanced/nfs/hostprops.ui
+++ b/filesharing/advanced/nfs/hostprops.ui
@@ -348,7 +348,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout15</cstring>
+                        <cstring>layout15</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -394,7 +394,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout16</cstring>
+                        <cstring>layout16</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp
index ecc93a7d..bd4c3cbd 100644
--- a/filesharing/advanced/nfs/nfsdialog.cpp
+++ b/filesharing/advanced/nfs/nfsdialog.cpp
@@ -62,8 +62,8 @@ void NFSDialog::initGUI() {
   TQWidget* page = plainPage();
   m_gui = new NFSDialogGUI(page);
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
-  tqlayout->addWidget( m_gui );
+  TQVBoxLayout *layout = new TQVBoxLayout( page );
+  layout->addWidget( m_gui );
   
   KAccel* accel = new KAccel( m_gui->listView );
   accel->insert( "Delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveHost()));
diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp
index c6bc1e20..e45f1f87 100644
--- a/filesharing/advanced/nfs/nfshostdlg.cpp
+++ b/filesharing/advanced/nfs/nfshostdlg.cpp
@@ -41,8 +41,8 @@ NFSHostDlg::NFSHostDlg(TQWidget* parent, HostList* hosts, NFSEntry* entry)
 
   m_gui = new HostProps(page);
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, 6 );
-  tqlayout->addWidget( m_gui );
+  TQVBoxLayout *layout = new TQVBoxLayout( page, 0, 6 );
+  layout->addWidget( m_gui );
 
   connect( m_gui, TQT_SIGNAL(modified()), this, TQT_SLOT(setModified()));
 
diff --git a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui
index 5beb1a81..a41de020 100644
--- a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui
+++ b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -108,7 +108,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -157,7 +157,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -216,7 +216,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -239,7 +239,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout5</cstring>
+                                <cstring>layout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -288,7 +288,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui
index c9fa3f12..7eec18af 100644
--- a/filesharing/simple/controlcenter.ui
+++ b/filesharing/simple/controlcenter.ui
@@ -66,7 +66,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -131,7 +131,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4_2</cstring>
+                        <cstring>layout4_2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -185,7 +185,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -251,7 +251,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index 2a81f704..5b796823 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -65,13 +65,13 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS
 {
   KGlobal::locale()->insertCatalogue("kfileshare");                            
 
-  TQBoxLayout* tqlayout = new TQVBoxLayout(this,0,
+  TQBoxLayout* layout = new TQVBoxLayout(this,0,
 				       KDialog::spacingHint());
 
 /*  
   TQVButtonGroup *box = new TQVButtonGroup( i18n("File Sharing"), this );
-  box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  tqlayout->addWidget(box);
+  box->layout()->setSpacing( KDialog::spacingHint() );
+  layout->addWidget(box);
   noSharing=new TQRadioButton( i18n("Do &not allow users to share files"), box );
   sharing=new TQRadioButton( i18n("&Allow users to share files from their HOME folder"),  box);
 */
@@ -106,7 +106,7 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS
       }
           
       m_ccgui->infoLbl->hide();      
-      tqlayout->addWidget(m_ccgui);
+      layout->addWidget(m_ccgui);
       updateShareListView();
       connect( KNFSShare::instance(), TQT_SIGNAL( changed()), 
                this, TQT_SLOT(updateShareListView()));
diff --git a/filesharing/simple/groupconfiggui.ui b/filesharing/simple/groupconfiggui.ui
index fd9a436c..13b26dc3 100644
--- a/filesharing/simple/groupconfiggui.ui
+++ b/filesharing/simple/groupconfiggui.ui
@@ -124,7 +124,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/filesharing/simple/krichtextlabel.h b/filesharing/simple/krichtextlabel.h
index 9e7cd8a1..513e1280 100644
--- a/filesharing/simple/krichtextlabel.h
+++ b/filesharing/simple/krichtextlabel.h
@@ -24,7 +24,7 @@
 #include <tdelibs_export.h>
 
 /**
- * @short A replacement for TQLabel that supports richtext and proper tqlayout management
+ * @short A replacement for TQLabel that supports richtext and proper layout management
  *
  * @author Waldo Bastian <bastian@kde.org>
  */