From 9c9412b30c54468adc9e506cc76c5d113fbf5056 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:03 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp | 12 ++++++------ filesharing/advanced/kcm_sambaconf/hiddenfileview.h | 14 +++++++------- filesharing/advanced/kcm_sambaconf/kcminterface.ui | 8 ++++---- filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp | 4 ++-- filesharing/advanced/kcm_sambaconf/share.ui | 2 +- filesharing/advanced/kcm_sambaconf/sharedlgimpl.h | 4 ++-- filesharing/advanced/kcm_sambaconf/usertabimpl.h | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'filesharing/advanced/kcm_sambaconf') diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index ba0f760c..0eb74f54 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -112,9 +112,9 @@ HiddenFileView::HiddenFileView(ShareDlgImpl* shareDlg, SambaShare* share) _share = share; _dlg = shareDlg; - _hiddenActn = new KToggleAction(i18n("&Hide")); - _vetoActn = new KToggleAction(i18n("&Veto")); - _vetoOplockActn = new KToggleAction(i18n("&Veto Oplock")); + _hiddenActn = new TDEToggleAction(i18n("&Hide")); + _vetoActn = new TDEToggleAction(i18n("&Veto")); + _vetoOplockActn = new TDEToggleAction(i18n("&Veto Oplock")); initListView(); @@ -166,14 +166,14 @@ void HiddenFileView::initListView() _vetoList = createRegExpList(_share->getValue("veto files")); _vetoOplockList = createRegExpList(_share->getValue("veto oplock files")); - _popup = new KPopupMenu(_dlg->hiddenListView); + _popup = new TDEPopupMenu(_dlg->hiddenListView); _hiddenActn->plug(_popup); _vetoActn->plug(_popup); _vetoOplockActn->plug(_popup); connect( _dlg->hiddenListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - connect( _dlg->hiddenListView, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*,const TQPoint&)), + connect( _dlg->hiddenListView, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), this, TQT_SLOT(showContextMenu())); connect( _dlg->hideDotFilesChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(hideDotFilesChkClicked(bool))); @@ -360,7 +360,7 @@ void HiddenFileView::selectionChanged() } } -void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQLineEdit* edit, int column,TQPtrList & reqExpList,bool b) { +void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,TDEToggleAction* action,TQLineEdit* edit, int column,TQPtrList & reqExpList,bool b) { // We don't save the old state so // disable the tristate mode chkBox->setTristate(false); diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h index 3d3d0aa8..f7e09e19 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h @@ -54,8 +54,8 @@ protected: KFileItem *_fileItem; }; -class KToggleAction; -class KPopupMenu; +class TDEToggleAction; +class TDEPopupMenu; class ShareDlgImpl; @@ -95,11 +95,11 @@ protected: TQPtrList _vetoList; TQPtrList _vetoOplockList; - KToggleAction* _hiddenActn; - KToggleAction* _vetoActn; - KToggleAction* _vetoOplockActn; + TDEToggleAction* _hiddenActn; + TDEToggleAction* _vetoActn; + TDEToggleAction* _vetoOplockActn; - KPopupMenu* _popup; + TDEPopupMenu* _popup; void initListView(); @@ -130,7 +130,7 @@ protected slots: void hiddenChkClicked(bool b); void vetoChkClicked(bool b); void vetoOplockChkClicked(bool b); - void checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQLineEdit* edit,int column,TQPtrList &reqExpList,bool b); + void checkBoxClicked(TQCheckBox* chkBox,TDEToggleAction* action,TQLineEdit* edit,int column,TQPtrList &reqExpList,bool b); void columnClicked(int column); void showContextMenu(); void updateView(); diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index c5a92b22..045c552e 100644 --- a/filesharing/advanced/kcm_sambaconf/kcminterface.ui +++ b/filesharing/advanced/kcm_sambaconf/kcminterface.ui @@ -659,7 +659,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. 6 - + Name @@ -807,7 +807,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. 6 - + Name @@ -983,7 +983,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. 6 - + Name @@ -1161,7 +1161,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. 6 - + Name diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 622e1f08..f22fbfba 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -1080,7 +1080,7 @@ void KcmSambaConf::loadUserTab() it=added.find(unixUser->name); if (it == added.end()) - new KListViewItem(_interface->unixUsersListView, unixUser->name, TQString::number(unixUser->uid)); + new TDEListViewItem(_interface->unixUsersListView, unixUser->name, TQString::number(unixUser->uid)); } _interface->unixUsersListView->setSelectionMode(TQListView::Extended); @@ -1215,7 +1215,7 @@ void KcmSambaConf::removeSambaUserBtnClicked() continue; } - new KListViewItem(_interface->unixUsersListView, item->text(0), item->text(1)); + new TDEListViewItem(_interface->unixUsersListView, item->text(0), item->text(1)); list.remove(item); delete item; } diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index ba600d17..91673c1a 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -566,7 +566,7 @@ 6 - + Name diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h index 0ca38b6c..5d0c630f 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.h @@ -40,8 +40,8 @@ class SambaShare; class TQWidget; -class KPopupMenu; -class KToggleAction; +class TDEPopupMenu; +class TDEToggleAction; class TQGroupBox; class UserTabImpl; class HiddenFileView; diff --git a/filesharing/advanced/kcm_sambaconf/usertabimpl.h b/filesharing/advanced/kcm_sambaconf/usertabimpl.h index a955c6b1..c9b0b159 100644 --- a/filesharing/advanced/kcm_sambaconf/usertabimpl.h +++ b/filesharing/advanced/kcm_sambaconf/usertabimpl.h @@ -37,7 +37,7 @@ *@author Jan Schäfer */ -class KListViewItem; +class TDEListViewItem; class SambaShare; /** -- cgit v1.2.1