Rename obsolete tq methods to standard names

5 files changed, 18 insertions, 18 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() {