From 089118c18533dfa3e6ce5065dbebdd4db94051f1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:33:51 -0600 Subject: Rename old tq methods that no longer need a unique name --- .../advanced/kcm_sambaconf/expertuserdlg.ui | 4 +- filesharing/advanced/kcm_sambaconf/filemodedlg.ui | 6 +- .../advanced/kcm_sambaconf/groupselectdlg.ui | 4 +- .../advanced/kcm_sambaconf/joindomaindlg.ui | 4 +- filesharing/advanced/kcm_sambaconf/kcminterface.ui | 120 ++++++++++----------- .../advanced/kcm_sambaconf/kcmprinterdlg.ui | 16 +-- .../advanced/kcm_sambaconf/kcmsambaconf.cpp | 2 +- .../advanced/kcm_sambaconf/konqinterface.ui | 4 +- filesharing/advanced/kcm_sambaconf/sambafile.cpp | 2 +- filesharing/advanced/kcm_sambaconf/share.ui | 66 ++++++------ .../advanced/kcm_sambaconf/smbpasswdfile.cpp | 2 +- .../advanced/kcm_sambaconf/socketoptionsdlg.ui | 2 +- .../advanced/kcm_sambaconf/userselectdlg.ui | 4 +- filesharing/advanced/kcm_sambaconf/usertab.ui | 2 +- 14 files changed, 119 insertions(+), 119 deletions(-) (limited to 'filesharing/advanced/kcm_sambaconf') diff --git a/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui b/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui index 690688c2..59b27886 100644 --- a/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/expertuserdlg.ui @@ -129,7 +129,7 @@ Expanding - + 20 20 @@ -179,7 +179,7 @@ Expanding - + 20 40 diff --git a/filesharing/advanced/kcm_sambaconf/filemodedlg.ui b/filesharing/advanced/kcm_sambaconf/filemodedlg.ui index 0f8867c8..96e207df 100644 --- a/filesharing/advanced/kcm_sambaconf/filemodedlg.ui +++ b/filesharing/advanced/kcm_sambaconf/filemodedlg.ui @@ -67,7 +67,7 @@ Expanding - + 20 43 @@ -84,7 +84,7 @@ Expanding - + 70 20 @@ -359,7 +359,7 @@ Expanding - + 20 20 diff --git a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui index 51f5e10b..08595eb5 100644 --- a/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/groupselectdlg.ui @@ -52,7 +52,7 @@ Expanding - + 285 20 @@ -113,7 +113,7 @@ Expanding - + 20 20 diff --git a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui index 2ab91cf5..51a0ff36 100644 --- a/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui +++ b/filesharing/advanced/kcm_sambaconf/joindomaindlg.ui @@ -46,7 +46,7 @@ Expanding - + 20 20 @@ -190,7 +190,7 @@ Expanding - + 20 40 diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index 39a21fb3..8b386a4d 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -521,7 +521,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 40 20 @@ -614,7 +614,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 30 0 @@ -633,7 +633,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 40 @@ -752,7 +752,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 0 @@ -900,7 +900,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 0 @@ -1066,7 +1066,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 30 @@ -1102,7 +1102,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 30 @@ -1135,7 +1135,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 20 30 @@ -1243,7 +1243,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. Expanding - + 240 20 @@ -1413,7 +1413,7 @@ Only change something if you know what you are doing. Expanding - + 20 40 @@ -1673,7 +1673,7 @@ Only change something if you know what you are doing. Expanding - + 180 20 @@ -1717,7 +1717,7 @@ Only change something if you know what you are doing. Expanding - + 117 20 @@ -1789,7 +1789,7 @@ Only change something if you know what you are doing. Expanding - + 20 40 @@ -2065,7 +2065,7 @@ Only change something if you know what you are doing. Expanding - + 20 20 @@ -2242,7 +2242,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -2295,7 +2295,7 @@ Only change something if you know what you are doing. Expanding - + 20 170 @@ -2458,7 +2458,7 @@ Only change something if you know what you are doing. Expanding - + 16 20 @@ -2592,7 +2592,7 @@ Only change something if you know what you are doing. Expanding - + 120 20 @@ -2611,7 +2611,7 @@ Only change something if you know what you are doing. Expanding - + 20 20 @@ -2730,7 +2730,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -2768,7 +2768,7 @@ Only change something if you know what you are doing. 0 - + 76 0 @@ -2834,7 +2834,7 @@ Only change something if you know what you are doing. statusChk - tqStatus + Status true @@ -2906,7 +2906,7 @@ Only change something if you know what you are doing. Expanding - + 20 60 @@ -3034,7 +3034,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -3053,7 +3053,7 @@ Only change something if you know what you are doing. Expanding - + 20 50 @@ -3144,7 +3144,7 @@ Only change something if you know what you are doing. Expanding - + 16 20 @@ -3493,7 +3493,7 @@ Only change something if you know what you are doing. Expanding - + 20 16 @@ -3694,7 +3694,7 @@ Only change something if you know what you are doing. Expanding - + 20 40 @@ -3730,7 +3730,7 @@ Only change something if you know what you are doing. Expanding - + 20 100 @@ -3811,7 +3811,7 @@ Only change something if you know what you are doing. Preferred - + 323 20 @@ -4060,7 +4060,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -4202,7 +4202,7 @@ Only change something if you know what you are doing. Expanding - + 20 120 @@ -4347,7 +4347,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -4393,7 +4393,7 @@ Only change something if you know what you are doing. Expanding - + 20 280 @@ -4570,7 +4570,7 @@ Only change something if you know what you are doing. Expanding - + 30 20 @@ -4640,7 +4640,7 @@ Only change something if you know what you are doing. Expanding - + 50 20 @@ -4659,7 +4659,7 @@ Only change something if you know what you are doing. Expanding - + 20 120 @@ -4917,7 +4917,7 @@ Only change something if you know what you are doing. Expanding - + 20 80 @@ -5036,7 +5036,7 @@ Only change something if you know what you are doing. Expanding - + 20 20 @@ -5481,7 +5481,7 @@ Only change something if you know what you are doing. Expanding - + 80 0 @@ -5500,7 +5500,7 @@ Only change something if you know what you are doing. Expanding - + 0 70 @@ -5729,7 +5729,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 140 0 @@ -5913,7 +5913,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 0 30 @@ -5949,7 +5949,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 50 @@ -6035,7 +6035,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 330 20 @@ -6193,7 +6193,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 40 20 @@ -6405,7 +6405,7 @@ This is only available if the SSL libraries have been compiled on your system an 0 - + 150 0 @@ -6468,7 +6468,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 340 20 @@ -6553,7 +6553,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 300 @@ -6728,7 +6728,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 370 20 @@ -6824,7 +6824,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 100 @@ -6860,7 +6860,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 280 @@ -6946,7 +6946,7 @@ This is only available if the SSL libraries have been compiled on your system an 0 - + 150 0 @@ -6993,7 +6993,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 0 30 @@ -7134,7 +7134,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 130 @@ -7339,7 +7339,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 330 20 @@ -7452,7 +7452,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 230 @@ -7643,7 +7643,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 40 20 @@ -7764,7 +7764,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 40 @@ -7838,7 +7838,7 @@ This is only available if the SSL libraries have been compiled on your system an Expanding - + 20 320 diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui index 4a622f1a..200f9eaa 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui @@ -319,7 +319,7 @@ Expanding - + 20 20 @@ -349,7 +349,7 @@ Expanding - + 20 50 @@ -535,7 +535,7 @@ Expanding - + 200 20 @@ -633,7 +633,7 @@ Expanding - + 20 20 @@ -683,7 +683,7 @@ Expanding - + 263 20 @@ -831,7 +831,7 @@ Expanding - + 20 20 @@ -944,7 +944,7 @@ Expanding - + 20 20 @@ -1079,7 +1079,7 @@ Expanding - + 20 20 diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 7914aef2..26b3a194 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -1267,7 +1267,7 @@ void KcmSambaConf::save() { // Base settings _smbconf = _interface->configUrlRq->url(); - KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),false); + KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),false); config.writeEntry("SMBCONF",_smbconf); config.sync(); diff --git a/filesharing/advanced/kcm_sambaconf/konqinterface.ui b/filesharing/advanced/kcm_sambaconf/konqinterface.ui index dfccf5c2..6cba8d8b 100644 --- a/filesharing/advanced/kcm_sambaconf/konqinterface.ui +++ b/filesharing/advanced/kcm_sambaconf/konqinterface.ui @@ -420,7 +420,7 @@ Expanding - + 20 0 @@ -447,7 +447,7 @@ Expanding - + 0 20 diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 50df27c0..0b1d1524 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -394,7 +394,7 @@ SambaShare* SambaFile::getTestParmValues(bool reload) void SambaFile::testParmStdOutReceived(KProcess *, char *buffer, int buflen) { - _parmOutput+=TQString::tqfromLatin1(buffer,buflen); + _parmOutput+=TQString::fromLatin1(buffer,buflen); } void SambaFile::parseParmStdOutput() diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index 65fff9c5..52971d94 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -304,7 +304,7 @@ Expanding - + 20 90 @@ -362,7 +362,7 @@ Expanding - + 50 20 @@ -540,7 +540,7 @@ Expanding - + 20 20 @@ -1050,7 +1050,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1072,7 +1072,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1086,7 +1086,7 @@ Only change something if you know what you are doing. forceCreateModeEdit - + 40 0 @@ -1100,7 +1100,7 @@ Only change something if you know what you are doing. forceSecurityModeEdit - + 40 0 @@ -1114,7 +1114,7 @@ Only change something if you know what you are doing. forceDirectoryModeEdit - + 40 0 @@ -1128,7 +1128,7 @@ Only change something if you know what you are doing. forceDirectorySecurityModeEdit - + 40 0 @@ -1150,7 +1150,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1172,7 +1172,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1194,7 +1194,7 @@ Only change something if you know what you are doing. Expanding - + 20 16 @@ -1272,7 +1272,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1294,7 +1294,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1316,7 +1316,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1330,7 +1330,7 @@ Only change something if you know what you are doing. securityMaskEdit - + 40 0 @@ -1344,7 +1344,7 @@ Only change something if you know what you are doing. directoryMaskEdit - + 40 0 @@ -1358,7 +1358,7 @@ Only change something if you know what you are doing. directorySecurityMaskEdit - + 40 0 @@ -1386,7 +1386,7 @@ Only change something if you know what you are doing. createMaskEdit - + 40 0 @@ -1408,7 +1408,7 @@ Only change something if you know what you are doing. 0 - + 20 0 @@ -1490,7 +1490,7 @@ Only change something if you know what you are doing. forceUnknownAclUserEdit - + 40 0 @@ -1676,7 +1676,7 @@ Only change something if you know what you are doing. Expanding - + 20 120 @@ -1759,7 +1759,7 @@ Only change something if you know what you are doing. Expanding - + 143 16 @@ -1933,7 +1933,7 @@ Only change something if you know what you are doing. Expanding - + 20 30 @@ -2024,7 +2024,7 @@ Only change something if you know what you are doing. manglingCharEdit - + 40 32767 @@ -2041,7 +2041,7 @@ Only change something if you know what you are doing. Expanding - + 20 0 @@ -2322,7 +2322,7 @@ Only change something if you know what you are doing. Expanding - + 20 20 @@ -2392,7 +2392,7 @@ Only change something if you know what you are doing. Expanding - + 299 20 @@ -2508,7 +2508,7 @@ Only change something if you know what you are doing. Expanding - + 40 20 @@ -2564,7 +2564,7 @@ Only change something if you know what you are doing. Expanding - + 20 260 @@ -2648,7 +2648,7 @@ Only change something if you know what you are doing. Expanding - + 16 284 @@ -2745,7 +2745,7 @@ Only change something if you know what you are doing. Expanding - + 20 50 @@ -2916,7 +2916,7 @@ Only change something if you know what you are doing. Expanding - + 20 0 diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp index b964d700..8286cdf3 100644 --- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp @@ -175,7 +175,7 @@ bool SmbPasswdFile::changePassword(const SambaUser & user, const TQString & newP void SmbPasswdFile::smbpasswdStdOutReceived(KProcess *, char *buffer, int buflen) { - _smbpasswdOutput+=TQString::tqfromLatin1(buffer,buflen); + _smbpasswdOutput+=TQString::fromLatin1(buffer,buflen); } diff --git a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui index b04f8b7b..e2d4be95 100644 --- a/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/socketoptionsdlg.ui @@ -238,7 +238,7 @@ Expanding - + 20 20 diff --git a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui index 1526832a..17d02c12 100644 --- a/filesharing/advanced/kcm_sambaconf/userselectdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/userselectdlg.ui @@ -183,7 +183,7 @@ Expanding - + 20 50 @@ -225,7 +225,7 @@ Expanding - + 285 20 diff --git a/filesharing/advanced/kcm_sambaconf/usertab.ui b/filesharing/advanced/kcm_sambaconf/usertab.ui index af5b87bf..57d8b591 100644 --- a/filesharing/advanced/kcm_sambaconf/usertab.ui +++ b/filesharing/advanced/kcm_sambaconf/usertab.ui @@ -159,7 +159,7 @@ Expanding - + 20 100 -- cgit v1.2.1