diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 2bc1d72869b62af05ae4feafd878203b526da8c5 (patch) | |
tree | 2676903bb600bd9646644856e354940471ad84e2 /filesharing/advanced/kcm_sambaconf | |
parent | 937b2991d8e78166eea904c80ad04d34607017a4 (diff) | |
download | tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.tar.gz tdenetwork-2bc1d72869b62af05ae4feafd878203b526da8c5.zip |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'filesharing/advanced/kcm_sambaconf')
19 files changed, 49 insertions, 49 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.cpp index 4ad53b0f..53b7c812 100644 --- a/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.cpp @@ -35,8 +35,8 @@ #include "filemodedlgimpl.h" -FileModeDlgImpl::FileModeDlgImpl(TQWidget* tqparent, TQLineEdit* edit) - : FileModeDlg(tqparent) +FileModeDlgImpl::FileModeDlgImpl(TQWidget* parent, TQLineEdit* edit) + : FileModeDlg(parent) { assert(edit); _edit = edit; diff --git a/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.h b/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.h index feca9624..a8e2c5a3 100644 --- a/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.h +++ b/filesharing/advanced/kcm_sambaconf/filemodedlgimpl.h @@ -53,7 +53,7 @@ class FileModeDlgImpl : public FileModeDlg Q_OBJECT TQ_OBJECT public: - FileModeDlgImpl(TQWidget* tqparent, TQLineEdit* edit); + FileModeDlgImpl(TQWidget* parent, TQLineEdit* edit); ~FileModeDlgImpl(); protected: TQLineEdit* _edit; diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index 70d2bda6..31a642ff 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -62,8 +62,8 @@ #define HIDDENTABINDEX 5 -HiddenListViewItem::HiddenListViewItem( TQListView *tqparent, KFileItem *fi, bool hidden=false, bool veto=false, bool vetoOplock=false ) - : QMultiCheckListItem( tqparent ) +HiddenListViewItem::HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden=false, bool veto=false, bool vetoOplock=false ) + : QMultiCheckListItem( parent ) { setPixmap( COL_NAME, fi->pixmap(KIcon::SizeSmall)); diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h index 6ce1c380..27bd7c7b 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h @@ -44,7 +44,7 @@ class HiddenListViewItem : public QMultiCheckListItem Q_OBJECT TQ_OBJECT public: - HiddenListViewItem( TQListView *tqparent, KFileItem *fi, bool hidden, bool veto, bool vetoOplock ); + HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden, bool veto, bool vetoOplock ); ~HiddenListViewItem(); virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index ce411c69..7914aef2 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -75,8 +75,8 @@ #define COL_NOPASSWORD 3 -ShareListViewItem::ShareListViewItem(TQListView * tqparent, SambaShare* share) - : TQListViewItem(tqparent) +ShareListViewItem::ShareListViewItem(TQListView * parent, SambaShare* share) + : TQListViewItem(parent) { setShare(share); } @@ -174,8 +174,8 @@ TQPixmap ShareListViewItem::createPropertyPixmap() return TQPixmap(pix); } -KcmSambaConf::KcmSambaConf(TQWidget *tqparent, const char *name) - : KCModule(tqparent,name) +KcmSambaConf::KcmSambaConf(TQWidget *parent, const char *name) + : KCModule(parent,name) { _dictMngr = 0L; _sambaFile = 0L; @@ -1432,10 +1432,10 @@ TQString KcmSambaConf::quickHelp() const extern "C" { - KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *tqparent, const char *name) + KDE_EXPORT KCModule *create_KcmSambaConf(TQWidget *parent, const char *name) { KGlobal::locale()->insertCatalogue("kfileshare"); - return new KcmSambaConf(tqparent, name); + return new KcmSambaConf(parent, name); } } diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h index 03032c87..d4c81992 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.h @@ -47,7 +47,7 @@ class TQPixmap; class ShareListViewItem : public TQListViewItem { public: - ShareListViewItem(TQListView * tqparent, SambaShare* share); + ShareListViewItem(TQListView * parent, SambaShare* share); SambaShare* getShare() const; void setShare(SambaShare* share); @@ -71,7 +71,7 @@ class KcmSambaConf: public KCModule Q_OBJECT TQ_OBJECT public: - KcmSambaConf(TQWidget *tqparent = 0L, const char *name = 0L); + KcmSambaConf(TQWidget *parent = 0L, const char *name = 0L); virtual ~KcmSambaConf(); void load(const TQString &); diff --git a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp index 6d8668e4..5bac2fdf 100644 --- a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp +++ b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp @@ -34,10 +34,10 @@ #include "sambashare.h" #include "linuxpermissionchecker.h" -LinuxPermissionChecker::LinuxPermissionChecker(SambaShare* share,TQWidget* tqparent = 0L) +LinuxPermissionChecker::LinuxPermissionChecker(SambaShare* share,TQWidget* parent = 0L) { m_sambaShare = share; - m_parent = tqparent; + m_parent = parent; if (!share) { kdWarning() << "WARNING: LinuxPermissionChecker: share is null !" << endl; diff --git a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.h b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.h index f50cd055..05b67656 100644 --- a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.h +++ b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.h @@ -43,7 +43,7 @@ class TQWidget; */ class LinuxPermissionChecker{ public: - LinuxPermissionChecker(SambaShare*,TQWidget* tqparent ); + LinuxPermissionChecker(SambaShare*,TQWidget* parent ); ~LinuxPermissionChecker(); /** diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp index 9a842dfb..da11d799 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp @@ -61,8 +61,8 @@ #include "dictmanager.h" -PrinterDlgImpl::PrinterDlgImpl(TQWidget* tqparent, SambaShare* share) - : KcmPrinterDlg(tqparent,"sharedlgimpl") +PrinterDlgImpl::PrinterDlgImpl(TQWidget* parent, SambaShare* share) + : KcmPrinterDlg(parent,"sharedlgimpl") { if (!share) { kdWarning() << "PrinterDlgImpl::Constructor : share parameter is null!" << endl; @@ -212,19 +212,19 @@ void PrinterDlgImpl::printersChkToggled(bool b) p.drawPixmap(dist+dist/2,2*dist,pix2); p.end(); - TQBitmap tqmask(w,h); + TQBitmap mask(w,h); - tqmask.fill(TQt::black); // everything is transparent + mask.fill(TQt::black); // everything is transparent - p.begin(&tqmask); + p.begin(&mask); p.setRasterOp(TQt::OrROP); - p.drawPixmap(dist+dist/2,0,*pix2.tqmask()); - p.drawPixmap(dist/2,dist,*pix2.tqmask()); - p.drawPixmap(dist+dist/2,2*dist,*pix2.tqmask()); + p.drawPixmap(dist+dist/2,0,*pix2.mask()); + p.drawPixmap(dist/2,dist,*pix2.mask()); + p.drawPixmap(dist+dist/2,2*dist,*pix2.mask()); p.end(); - pix.setMask(tqmask); + pix.setMask(mask); printerPixLbl->setPixmap(pix); pixFrame->tqlayout()->setMargin( 2 ); diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.h b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.h index 56d7ae7f..66507710 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.h +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.h @@ -51,7 +51,7 @@ Q_OBJECT public : - PrinterDlgImpl(TQWidget* tqparent, SambaShare* share); + PrinterDlgImpl(TQWidget* parent, SambaShare* share); ~PrinterDlgImpl(); protected : diff --git a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp index 094daa9c..1600aa7c 100644 --- a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp +++ b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp @@ -40,8 +40,8 @@ static const int BoxSize = 16; -QMultiCheckListItem::QMultiCheckListItem( TQListView *tqparent=0) : - TQListViewItem(tqparent) { +QMultiCheckListItem::QMultiCheckListItem( TQListView *parent=0) : + TQListViewItem(parent) { } void QMultiCheckListItem::setOn(int column, bool b) { @@ -108,7 +108,7 @@ void QMultiCheckListItem::paintCell(TQPainter *p,const TQColorGroup & cg, int co // Bold/Italic/use default checkboxes // code allmost identical to TQCheckListItem Q_ASSERT( lv ); //### - // I use the text color of defaultStyles[0], normalcol in tqparent listview + // I use the text color of defaultStyles[0], normalcol in parent listview // mcg.setColor( TQColorGroup::Text, ((StyleListView*)lv)->normalcol ); int x = 0; if ( align == AlignCenter ) { diff --git a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.h b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.h index 46b54cde..d7c39343 100644 --- a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.h +++ b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.h @@ -38,7 +38,7 @@ Q_OBJECT TQ_OBJECT public: - QMultiCheckListItem( TQListView *tqparent); + QMultiCheckListItem( TQListView *parent); ~QMultiCheckListItem() {}; virtual bool isOn(int column); diff --git a/filesharing/advanced/kcm_sambaconf/sambashare.cpp b/filesharing/advanced/kcm_sambaconf/sambashare.cpp index c4f02af9..a2c58565 100644 --- a/filesharing/advanced/kcm_sambaconf/sambashare.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambashare.cpp @@ -139,12 +139,12 @@ TQString SambaShare::getSynonym(const TQString & name) const if (lname == "allow hosts") return "hosts allow"; if (lname == "auto services") return "preload"; if (lname == "casesignames") return "case sensitive"; - if (lname == "create mode") return "create tqmask"; + if (lname == "create mode") return "create mask"; if (lname == "debuglevel") return "log level"; if (lname == "default") return "default service"; if (lname == "deny hosts") return "hosts deny"; if (lname == "directory") return "path"; - if (lname == "directory mode") return "directory tqmask"; + if (lname == "directory mode") return "directory mask"; if (lname == "exec") return "preexec"; if (lname == "group") return "force group"; if (lname == "lock dir") return "lock directory"; diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index bcc0684e..65fff9c5 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -1223,7 +1223,7 @@ Only change something if you know what you are doing.</string> <cstring>TextLabel5_2_4_2_2_2</cstring> </property> <property name="text"> - <string>Directory security tqmask:</string> + <string>Directory security mask:</string> </property> <property name="buddy" stdset="0"> <cstring>directorySecurityMaskEdit</cstring> @@ -1237,7 +1237,7 @@ Only change something if you know what you are doing.</string> <cstring>TextLabel5_2_4_3</cstring> </property> <property name="text"> - <string>Security &tqmask:</string> + <string>Security &mask:</string> </property> <property name="buddy" stdset="0"> <cstring>securityMaskEdit</cstring> @@ -1251,7 +1251,7 @@ Only change something if you know what you are doing.</string> <cstring>TextLabel5_2_4_2_3</cstring> </property> <property name="text"> - <string>Direc&tory tqmask:</string> + <string>Direc&tory mask:</string> </property> <property name="buddy" stdset="0"> <cstring>directoryMaskEdit</cstring> @@ -1524,7 +1524,7 @@ Only change something if you know what you are doing.</string> <cstring>inheritPermissionsChk</cstring> </property> <property name="text"> - <string>Inherit permissions from tqparent directory</string> + <string>Inherit permissions from parent directory</string> </property> </widget> <widget class="TQCheckBox"> diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 3c0a8cab..55a1983c 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -80,8 +80,8 @@ -ShareDlgImpl::ShareDlgImpl(TQWidget* tqparent, SambaShare* share) - : KcmShareDlg(tqparent,"sharedlgimpl") +ShareDlgImpl::ShareDlgImpl(TQWidget* parent, SambaShare* share) + : KcmShareDlg(parent,"sharedlgimpl") { if (!share) { kdWarning() << "ShareDlgImpl::Constructor : share parameter is null!" << endl; @@ -169,10 +169,10 @@ void ShareDlgImpl::initDialog() _dictMngr->add("force security mode",forceSecurityModeEdit); _dictMngr->add("force create mode",forceCreateModeEdit); - _dictMngr->add("directory security tqmask",directorySecurityMaskEdit); - _dictMngr->add("directory tqmask",directoryMaskEdit); - _dictMngr->add("security tqmask",securityMaskEdit); - _dictMngr->add("create tqmask",createMaskEdit); + _dictMngr->add("directory security mask",directorySecurityMaskEdit); + _dictMngr->add("directory mask",directoryMaskEdit); + _dictMngr->add("security mask",securityMaskEdit); + _dictMngr->add("create mask",createMaskEdit); _dictMngr->add("inherit permissions",inheritPermissionsChk); _dictMngr->add("inherit acls",inheritAclsChk); _dictMngr->add("nt acl support",ntAclSupportChk); diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h index 450b634b..3c5a56aa 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h @@ -58,7 +58,7 @@ Q_OBJECT public : - ShareDlgImpl(TQWidget* tqparent, SambaShare* share); + ShareDlgImpl(TQWidget* parent, SambaShare* share); ~ShareDlgImpl(); bool hasChanged() { return m_changed; }; diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp index 3ee78bf8..3805429b 100644 --- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp @@ -39,8 +39,8 @@ #include "smbconfconfigwidget.h" -SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* tqparent) - : TQWidget(tqparent,"configWidget") +SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* parent) + : TQWidget(parent,"configWidget") { TQVBoxLayout *tqlayout = new TQVBoxLayout(this,5); diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp index 366a3f15..c07da925 100644 --- a/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.cpp @@ -57,8 +57,8 @@ * @pre share is not null * @post _share = share */ -UserTabImpl::UserTabImpl(TQWidget* tqparent, SambaShare* share) - : UserTab(tqparent) +UserTabImpl::UserTabImpl(TQWidget* parent, SambaShare* share) + : UserTab(parent) { if (share == 0L) { kdWarning() << "WARNING: UserTabImpl constructor: share parameter is null!" << endl; diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.h b/filesharing/advanced/kcm_sambaconf/usertabimpl.h index cfa4ac1a..d7ad378b 100644 --- a/filesharing/advanced/kcm_sambaconf/usertabimpl.h +++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.h @@ -50,7 +50,7 @@ class UserTabImpl : public UserTab Q_OBJECT TQ_OBJECT public: - UserTabImpl(TQWidget* tqparent, SambaShare* share); + UserTabImpl(TQWidget* parent, SambaShare* share); ~UserTabImpl(); void load(); |