diff options
| author | Timothy Pearson <[email protected]> | 2011-12-15 15:49:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-15 15:49:40 -0600 |
| commit | 808e453c56036211f57482ed847d54aca01bba68 (patch) | |
| tree | 75515d5768dea10d4fbe4cd772e0a89c1c4b3aa9 /filesharing | |
| parent | cd9b9ed7fd0ac8a75106148254aa58e2e5c04863 (diff) | |
| download | tdenetwork-808e453c56036211f57482ed847d54aca01bba68.tar.gz tdenetwork-808e453c56036211f57482ed847d54aca01bba68.zip | |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'filesharing')
38 files changed, 255 insertions, 255 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp index 6048e871..04eb0be7 100644 --- a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp +++ b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp @@ -58,7 +58,7 @@ DictManager::~DictManager() { void DictManager::handleUnsupportedWidget(const TQString & s, TQWidget* w) { w->setEnabled(false); - TQToolTip::add(w,i18n("The option <em>%1</em> is not supported by your Samba version").tqarg(s)); + TQToolTip::add(w,i18n("The option <em>%1</em> is not supported by your Samba version").arg(s)); } void DictManager::add(const TQString & key, TQLineEdit* lineEdit) { 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -179,7 +179,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>43</height> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>20</height> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>285</width> <height>20</height> @@ -113,7 +113,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index 31a642ff..09252315 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -91,7 +91,7 @@ KFileItem* HiddenListViewItem::getFileItem() } -void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) +void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup _cg = cg; @@ -101,7 +101,7 @@ void HiddenListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int col if (isOn(COL_HIDDEN)) _cg.setColor(TQColorGroup::Text,gray); - QMultiCheckListItem::paintCell(p, _cg, column, width, tqalignment); + QMultiCheckListItem::paintCell(p, _cg, column, width, alignment); } @@ -404,7 +404,7 @@ void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQ // TODO remove <b></b> and use <qt> instead int result = KMessageBox::questionYesNo(_dlg,i18n( "<b></b>Some files you have selected are matched by the wildcarded string <b>'%1'</b>; " - "do you want to uncheck all files matching <b>'%1'</b>?").tqarg(rx->pattern()).tqarg(rx->pattern()).tqarg(rx->pattern()), + "do you want to uncheck all files matching <b>'%1'</b>?").arg(rx->pattern()).arg(rx->pattern()).arg(rx->pattern()), i18n("Wildcarded String"),i18n("Uncheck Matches"),i18n("Keep Selected")); TQPtrList<HiddenListViewItem> lst = getMatchingItems( *rx ); @@ -519,7 +519,7 @@ void HiddenFileView::updateView() item->setOn(COL_VETO_OPLOCK,matchVetoOplock(item->text(0))); } - _dlg->hiddenListView->tqrepaint(); + _dlg->hiddenListView->repaint(); } diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h index 27bd7c7b..58e0e056 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.h +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.h @@ -47,7 +47,7 @@ public: 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); + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); KFileItem* getFileItem(); protected: 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/filesharing/advanced/kcm_sambaconf/kcminterface.ui b/filesharing/advanced/kcm_sambaconf/kcminterface.ui index 39a21fb3..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"> @@ -370,7 +370,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> <property name="indent"> @@ -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"> @@ -521,7 +521,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -584,7 +584,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="text"> <string>For detailed help about every option please look at:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -614,7 +614,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -633,7 +633,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -752,7 +752,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -900,7 +900,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -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"> @@ -1066,7 +1066,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -1102,7 +1102,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -1135,7 +1135,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -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"> @@ -1243,7 +1243,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>240</width> <height>20</height> @@ -1413,7 +1413,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -1673,7 +1673,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>20</height> @@ -1717,7 +1717,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>117</width> <height>20</height> @@ -1789,7 +1789,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -2065,7 +2065,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -2242,7 +2242,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -2295,7 +2295,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>170</height> @@ -2458,7 +2458,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -2592,7 +2592,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>20</height> @@ -2611,7 +2611,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -2730,7 +2730,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -2768,7 +2768,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>76</width> <height>0</height> @@ -2834,7 +2834,7 @@ Only change something if you know what you are doing.</string> <cstring>statusChk</cstring> </property> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="checked"> <bool>true</bool> @@ -2906,7 +2906,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -3034,7 +3034,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -3053,7 +3053,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -3144,7 +3144,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -3493,7 +3493,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -3694,7 +3694,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -3730,7 +3730,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> @@ -3811,7 +3811,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>323</width> <height>20</height> @@ -4060,7 +4060,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -4202,7 +4202,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -4347,7 +4347,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -4393,7 +4393,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>280</height> @@ -4570,7 +4570,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -4607,7 +4607,7 @@ Only change something if you know what you are doing.</string> <property name="text"> <string>Oplock break &wait time:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -4640,7 +4640,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -4659,7 +4659,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -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&nicode</string> @@ -4917,7 +4917,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -5036,7 +5036,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -5481,7 +5481,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>0</height> @@ -5500,7 +5500,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>70</height> @@ -5729,7 +5729,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>0</height> @@ -5913,7 +5913,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -5949,7 +5949,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -6035,7 +6035,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>330</width> <height>20</height> @@ -6193,7 +6193,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -6405,7 +6405,7 @@ This is only available if the SSL libraries have been compiled on your system an <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -6468,7 +6468,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>340</width> <height>20</height> @@ -6553,7 +6553,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>300</height> @@ -6728,7 +6728,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>370</width> <height>20</height> @@ -6824,7 +6824,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> @@ -6860,7 +6860,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>280</height> @@ -6946,7 +6946,7 @@ This is only available if the SSL libraries have been compiled on your system an <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -6993,7 +6993,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -7134,7 +7134,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> @@ -7339,7 +7339,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>330</width> <height>20</height> @@ -7452,7 +7452,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>230</height> @@ -7643,7 +7643,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -7764,7 +7764,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -7838,7 +7838,7 @@ This is only available if the SSL libraries have been compiled on your system an <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>320</height> @@ -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/kcmprinterdlg.ui b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui index 4a622f1a..069059bc 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui @@ -25,7 +25,7 @@ <property name='name'> <cstring>KcmPrinterDlg</cstring> </property> - <property name='tqgeometry'> + <property name='geometry'> <rect> <x>0</x> <y>0</y> @@ -319,7 +319,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>20</height> @@ -349,7 +349,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>50</height> @@ -535,7 +535,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>200</width> <height>20</height> @@ -633,7 +633,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>20</height> @@ -683,7 +683,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>263</width> <height>20</height> @@ -831,7 +831,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>20</height> @@ -944,7 +944,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>20</height> @@ -1079,7 +1079,7 @@ <property name='sizeType'> <enum>Expanding</enum> </property> - <property name='tqsizeHint'> + <property name='sizeHint'> <size> <width>20</width> <height>20</height> diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 7914aef2..64d09e0c 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -32,7 +32,7 @@ #include <assert.h> #include <unistd.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqpainter.h> #include <tqcheckbox.h> @@ -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* ) @@ -1102,7 +1102,7 @@ void KcmSambaConf::joinADomainBtnClicked() { dlg->usernameEdit->text(), dlg->passwordEdit->text())) { - KMessageBox::sorry(0,i18n("Joining the domain %1 failed.").tqarg(dlg->domainEdit->text())); + KMessageBox::sorry(0,i18n("Joining the domain %1 failed.").arg(dlg->domainEdit->text())); } } delete dlg; @@ -1172,7 +1172,7 @@ void KcmSambaConf::addSambaUserBtnClicked() TQCString password; int passResult = KPasswordDialog::getNewPassword(password, - i18n("<qt>Please enter a password for the user <b>%1</b></qt>").tqarg(user.name)); + i18n("<qt>Please enter a password for the user <b>%1</b></qt>").arg(user.name)); if (passResult != KPasswordDialog::Accepted) { list.remove(item); continue; @@ -1180,7 +1180,7 @@ void KcmSambaConf::addSambaUserBtnClicked() if (!passwd.addUser(user,password)) { - KMessageBox::sorry(0,i18n("<qt>Adding the user <b>%1</b> to the Samba user database failed.</qt>").tqarg(user.name)); + KMessageBox::sorry(0,i18n("<qt>Adding the user <b>%1</b> to the Samba user database failed.</qt>").arg(user.name)); break; } @@ -1211,7 +1211,7 @@ void KcmSambaConf::removeSambaUserBtnClicked() SambaUser user( item->text(0), item->text(1).toInt() ); if (!passwd.removeUser(user)) { - KMessageBox::sorry(0,i18n("Removing the user %1 from the Samba user database failed.").tqarg(user.name)); + KMessageBox::sorry(0,i18n("Removing the user %1 from the Samba user database failed.").arg(user.name)); continue; } @@ -1235,13 +1235,13 @@ void KcmSambaConf::sambaUserPasswordBtnClicked() TQCString password; int passResult = KPasswordDialog::getNewPassword(password, - i18n("Please enter a password for the user %1").tqarg(user.name)); + i18n("Please enter a password for the user %1").arg(user.name)); if (passResult != KPasswordDialog::Accepted) return; if (!passwd.changePassword(user,password)) { - KMessageBox::sorry(0,i18n("Changing the password of the user %1 failed.").tqarg(user.name)); + KMessageBox::sorry(0,i18n("Changing the password of the user %1 failed.").arg(user.name)); } else { static_cast<QMultiCheckListItem*>(item)->setOn(COL_NOPASSWORD,false); } @@ -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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -447,7 +447,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp index 5bac2fdf..83ea5180 100644 --- a/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp +++ b/filesharing/advanced/kcm_sambaconf/linuxpermissionchecker.cpp @@ -115,7 +115,7 @@ bool LinuxPermissionChecker::checkPublicPermissions() { 0L,i18n( "<qt>You have specified <b>public read access</b> for this directory, but " "the guest account <b>%1</b> does not have the necessary read permissions;<br>" - "do you want to continue anyway?</qt>").tqarg(guestAccount) + "do you want to continue anyway?</qt>").arg(guestAccount) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_guestAccountHasNoReadPermissionsWarning")) @@ -129,7 +129,7 @@ bool LinuxPermissionChecker::checkPublicPermissions() { 0L,i18n( "<qt>You have specified <b>public write access</b> for this directory, but " "the guest account <b>%1</b> does not have the necessary write permissions;<br>" - "do you want to continue anyway?</qt>").tqarg(guestAccount) + "do you want to continue anyway?</qt>").arg(guestAccount) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_guestAccountHasNoWritePermissionsWarning")) @@ -166,7 +166,7 @@ bool LinuxPermissionChecker::checkUserWritePermissions(const TQString & user, bo 0L,i18n( "<qt>You have specified <b>write access</b> to the user <b>%1</b> for this directory, but " "the user does not have the necessary write permissions;<br>" - "do you want to continue anyway?</qt>").tqarg(user) + "do you want to continue anyway?</qt>").arg(user) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_userHasNoWritePermissionsWarning")) @@ -189,7 +189,7 @@ bool LinuxPermissionChecker::checkUserReadPermissions(const TQString & user, boo 0L,i18n( "<qt>You have specified <b>read access</b> to the user <b>%1</b> for this directory, but " "the user does not have the necessary read permissions;<br>" - "do you want to continue anyway?</qt>").tqarg(user) + "do you want to continue anyway?</qt>").arg(user) ,i18n("Warning") ,KStdGuiItem::cont() ,"KSambaPlugin_userHasNoReadPermissionsWarning")) diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp index 0ba2082b..6182c5b0 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp @@ -39,7 +39,7 @@ #include <tqgroupbox.h> #include <tqpixmap.h> #include <tqbitmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <klineedit.h> @@ -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/qmultichecklistitem.cpp b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp index 1600aa7c..187289b6 100644 --- a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp +++ b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp @@ -53,7 +53,7 @@ void QMultiCheckListItem::setOn(int column, bool b) { checkStates.setBit(column,b); checkBoxColumns.setBit(column); kdDebug(5009) << "setOn : " << column << endl; - tqrepaint(); + repaint(); } bool QMultiCheckListItem::isOn(int column) { @@ -74,7 +74,7 @@ void QMultiCheckListItem::toggle(int column) { checkStates.toggleBit(column); emit stateChanged(column,checkStates.testBit(column)); - tqrepaint(); + repaint(); } void QMultiCheckListItem::setDisabled(int column, bool b) { @@ -83,8 +83,8 @@ void QMultiCheckListItem::setDisabled(int column, bool b) { } disableStates.setBit(column,b); -// KMessageBox::information(0L,TQString("setDisabled"),TQString("disable %1 ").tqarg(column)); - tqrepaint(); +// KMessageBox::information(0L,TQString("setDisabled"),TQString("disable %1 ").arg(column)); + repaint(); } void QMultiCheckListItem::paintCell(TQPainter *p,const TQColorGroup & cg, int col, int width, int align) diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index 50df27c0..4703716b 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -174,14 +174,14 @@ bool SambaFile::slotApply() kdDebug(5009) << "SambaFile::slotApply: is local file!" << endl; TQString suCommand=TQString("cp %1 %2; rm %3") - .tqarg(_tempFile->name()) - .tqarg(path) - .tqarg(_tempFile->name()); + .arg(_tempFile->name()) + .arg(path) + .arg(_tempFile->name()); proc << "tdesu" << "-d" << suCommand; if (! proc.start(KProcess::Block)) { kdDebug(5009) << "SambaFile::slotApply: saving to " << path << " failed!" << endl; - //KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").tqarg(path)); + //KMessageBox::sorry(0,i18n("Saving the results to %1 failed.").arg(path)); delete _tempFile; _tempFile = 0; return false; @@ -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() @@ -506,7 +506,7 @@ bool SambaFile::openFile() { TQFile f(localPath); if (!f.open(IO_ReadOnly)) { - //throw SambaFileLoadException(TQString("<qt>Could not open file <em>%1</em> for reading.</qt>").tqarg(path)); + //throw SambaFileLoadException(TQString("<qt>Could not open file <em>%1</em> for reading.</qt>").arg(path)); return false; } diff --git a/filesharing/advanced/kcm_sambaconf/share.ui b/filesharing/advanced/kcm_sambaconf/share.ui index 65fff9c5..ba600d17 100644 --- a/filesharing/advanced/kcm_sambaconf/share.ui +++ b/filesharing/advanced/kcm_sambaconf/share.ui @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -362,7 +362,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -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"> @@ -1050,7 +1050,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1072,7 +1072,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1086,7 +1086,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>forceCreateModeEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1100,7 +1100,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>forceSecurityModeEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1114,7 +1114,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>forceDirectoryModeEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1128,7 +1128,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>forceDirectorySecurityModeEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1150,7 +1150,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1172,7 +1172,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1194,7 +1194,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -1272,7 +1272,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1294,7 +1294,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1316,7 +1316,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1330,7 +1330,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>securityMaskEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1344,7 +1344,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>directoryMaskEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1358,7 +1358,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>directorySecurityMaskEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1386,7 +1386,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>createMaskEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1408,7 +1408,7 @@ Only change something if you know what you are doing.</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>20</width> <height>0</height> @@ -1490,7 +1490,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>forceUnknownAclUserEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>0</height> @@ -1676,7 +1676,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> @@ -1759,7 +1759,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>143</width> <height>16</height> @@ -1933,7 +1933,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -2024,7 +2024,7 @@ Only change something if you know what you are doing.</string> <property name="name"> <cstring>manglingCharEdit</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>32767</height> @@ -2041,7 +2041,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -2322,7 +2322,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -2392,7 +2392,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>299</width> <height>20</height> @@ -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"> @@ -2508,7 +2508,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -2564,7 +2564,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>260</height> @@ -2648,7 +2648,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>284</height> @@ -2745,7 +2745,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -2916,7 +2916,7 @@ Only change something if you know what you are doing.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 55a1983c..ce2d15ad 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -36,7 +36,7 @@ #include <tqcombobox.h> #include <tqlabel.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> #include <tqregexp.h> #include <tqstringlist.h> diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp index 3805429b..c9616a14 100644 --- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp @@ -27,7 +27,7 @@ ******************************************************************************/ #include <tqfileinfo.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqlabel.h> @@ -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() { @@ -72,7 +72,7 @@ void SmbConfConfigWidget::btnPressed() { if (smbConf.isEmpty()) return; if ( ! TQFileInfo(smbConf).isReadable() ) { - KMessageBox::sorry(this,i18n("<qt>The file <i>%1</i> could not be read.</qt>").tqarg(smbConf),i18n("Could Not Read File")); + KMessageBox::sorry(this,i18n("<qt>The file <i>%1</i> could not be read.</qt>").arg(smbConf),i18n("Could Not Read File")); return; } diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp index b964d700..f6a2282b 100644 --- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp @@ -28,7 +28,7 @@ #include <tqstring.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> #include <kurl.h> @@ -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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -225,7 +225,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>285</width> <height>20</height> 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui index b7fd9f79..d3775c32 100644 --- a/filesharing/advanced/nfs/hostprops.ui +++ b/filesharing/advanced/nfs/hostprops.ui @@ -34,7 +34,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>180</width> <height>0</height> @@ -302,7 +302,7 @@ Early NFS client implementations did not send credentials with lock requests, an <property name="title"> <string>User Mapping</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> <vbox> @@ -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"> @@ -380,7 +380,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -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"> @@ -426,7 +426,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -450,7 +450,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp index ecc93a7d..0dbd5b7a 100644 --- a/filesharing/advanced/nfs/nfsdialog.cpp +++ b/filesharing/advanced/nfs/nfsdialog.cpp @@ -23,7 +23,7 @@ #include <tqgroupbox.h> #include <tqlineedit.h> #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <kdebug.h> #include <kmessagebox.h> @@ -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/nfsdialoggui.ui b/filesharing/advanced/nfs/nfsdialoggui.ui index a9295773..ca77e192 100644 --- a/filesharing/advanced/nfs/nfsdialoggui.ui +++ b/filesharing/advanced/nfs/nfsdialoggui.ui @@ -89,7 +89,7 @@ The first column shows the name or address of the host, the second column shows <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/filesharing/advanced/nfs/nfsentry.cpp b/filesharing/advanced/nfs/nfsentry.cpp index b54a3169..397e19b4 100644 --- a/filesharing/advanced/nfs/nfsentry.cpp +++ b/filesharing/advanced/nfs/nfsentry.cpp @@ -125,10 +125,10 @@ TQString NFSHost::paramString() const if (!hide) s+="nohide,"; if (anongid!=65534) - s+=TQString("anongid=%1,").tqarg(anongid); + s+=TQString("anongid=%1,").arg(anongid); if (anonuid!=65534) - s+=TQString("anonuid=%1,").tqarg(anonuid); + s+=TQString("anonuid=%1,").arg(anonuid); // get rid of the last ',' s.truncate(s.length()-1); diff --git a/filesharing/advanced/nfs/nfsentry.h b/filesharing/advanced/nfs/nfsentry.h index 98d1e56a..43071504 100644 --- a/filesharing/advanced/nfs/nfsentry.h +++ b/filesharing/advanced/nfs/nfsentry.h @@ -74,7 +74,7 @@ typedef TQPtrListIterator<NFSLine> NFSLineIterator; class NFSEmptyLine : public NFSLine { public: - virtual TQString toString() const { return TQString::tqfromLatin1("\n"); } + virtual TQString toString() const { return TQString::fromLatin1("\n"); } virtual ~NFSEmptyLine() {}; }; diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp index 9eb674c8..0c5f52eb 100644 --- a/filesharing/advanced/nfs/nfsfile.cpp +++ b/filesharing/advanced/nfs/nfsfile.cpp @@ -23,7 +23,7 @@ #include <tqfileinfo.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqstringlist.h> #include <kdebug.h> @@ -241,8 +241,8 @@ bool NFSFile::save() KProcIO proc; TQString command = TQString("cp %1 %2") - .tqarg(KProcess::quote( tempFile.name() )) - .tqarg(KProcess::quote( _url.path() )); + .arg(KProcess::quote( tempFile.name() )) + .arg(KProcess::quote( _url.path() )); if (restartNFSServer) command +=";exportfs -ra"; diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp index c4c1002d..09307e92 100644 --- a/filesharing/advanced/nfs/nfshostdlg.cpp +++ b/filesharing/advanced/nfs/nfshostdlg.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqwhatsthis.h> #include <tqgroupbox.h> @@ -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())); @@ -156,14 +156,14 @@ bool NFSHostDlg::saveName(NFSHost* host) { TQString name = m_gui->nameEdit->text().stripWhiteSpace(); if (name.isEmpty()) { KMessageBox::sorry(this, - i18n("Please enter a hostname or an IP address.").tqarg(name), + i18n("Please enter a hostname or an IP address.").arg(name), i18n("No Hostname/IP-Address")); m_gui->nameEdit->setFocus(); return false; } else { NFSHost* host2 = m_nfsEntry->getHostByName(name); if (host2 && host2 != host) { - KMessageBox::sorry(this,i18n("The host '%1' already exists.").tqarg(name), + KMessageBox::sorry(this,i18n("The host '%1' already exists.").arg(name), i18n("Host Already Exists")); m_gui->nameEdit->setFocus(); return false; diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp index b52fd8fc..5ff1af7b 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp +++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp @@ -211,15 +211,15 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool if (nfsNeedsKDEsu) { nfsFile->saveTo(nfsTempFile.name()); command += TQString("cp %1 %2;exportfs -ra;") - .tqarg(KProcess::quote( nfsTempFile.name() )) - .tqarg(KProcess::quote( nfsFileName )); + .arg(KProcess::quote( nfsTempFile.name() )) + .arg(KProcess::quote( nfsFileName )); } if (sambaNeedsKDEsu) { sambaFile->saveTo(sambaTempFile.name()); command += TQString("cp %1 %2;") - .tqarg(KProcess::quote( sambaTempFile.name() )) - .tqarg(KProcess::quote( sambaFileName )); + .arg(KProcess::quote( sambaTempFile.name() )) + .arg(KProcess::quote( sambaFileName )); } proc<<"tdesu" << "-d" << "-c"<<command; @@ -527,7 +527,7 @@ bool PropertiesPage::updateSambaShare() { SambaShare* otherShare = m_sambaFile->getShare(sambaNameEdit->text()); if (otherShare && otherShare != m_sambaShare) { // There is another Share with the same name - KMessageBox::sorry(this, i18n("<qt>There is already a share with the name <strong>%1</strong>.<br> Please choose another name.</qt>").tqarg(sambaNameEdit->text())); + KMessageBox::sorry(this, i18n("<qt>There is already a share with the name <strong>%1</strong>.<br> Please choose another name.</qt>").arg(sambaNameEdit->text())); sambaNameEdit->selectAll(); sambaNameEdit->setFocus(); return false; diff --git a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui index 3ba4aca5..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"> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -157,7 +157,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -181,7 +181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>156</width> <height>20</height> @@ -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"> @@ -277,7 +277,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -288,7 +288,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -312,7 +312,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -335,7 +335,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>1</height> diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp index 2af403f5..f9baf270 100644 --- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp +++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp @@ -18,7 +18,7 @@ */ #include <tqstring.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kgenericfactory.h> diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui index 26307437..7eec18af 100644 --- a/filesharing/simple/controlcenter.ui +++ b/filesharing/simple/controlcenter.ui @@ -29,7 +29,7 @@ <property name="text"> <string>SMB and NFS servers are not installed on this machine, to enable this module the servers must be installed.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -66,7 +66,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -84,7 +84,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>11</width> <height>0</height> @@ -112,7 +112,7 @@ <property name="text"> <string>Enable simple sharing to allow users to share folders from their HOME folder, without knowing the root password.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -131,7 +131,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4_2</cstring> + <cstring>layout4_2</cstring> </property> <hbox> <property name="name"> @@ -149,7 +149,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>11</width> <height>0</height> @@ -177,7 +177,7 @@ <property name="text"> <string>Enable advanced sharing to allow users to share any folders, as long as they have write access to the needed configuration files, or they know the root password.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -185,7 +185,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -203,7 +203,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>11</width> <height>0</height> @@ -251,7 +251,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -275,7 +275,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -398,7 +398,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 0e41554d..6b24d656 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -16,7 +16,7 @@ */ #include <unistd.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbuttongroup.h> #include <tqvgroupbox.h> #include <tqlabel.h> @@ -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 ¬ allow users to share files"), box ); sharing=new TQRadioButton( i18n("&Allow users to share files from their HOME folder"), box); */ @@ -81,9 +81,9 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS this, TQT_SLOT(allowedUsersBtnClicked())); TQString path = TQString::fromLocal8Bit( getenv( "PATH" ) ); - path += TQString::tqfromLatin1(":/usr/sbin"); - TQString sambaExec = KStandardDirs::findExe( TQString::tqfromLatin1("smbd"), path ); - TQString nfsExec = KStandardDirs::findExe( TQString::tqfromLatin1("rpc.nfsd"), path ); + path += TQString::fromLatin1(":/usr/sbin"); + TQString sambaExec = KStandardDirs::findExe( TQString::fromLatin1("smbd"), path ); + TQString nfsExec = KStandardDirs::findExe( TQString::fromLatin1("rpc.nfsd"), path ); if ( nfsExec.isEmpty() && sambaExec.isEmpty()) { @@ -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())); @@ -196,7 +196,7 @@ void KFileShareConfig::allowedUsersBtnClicked() { void KFileShareConfig::load() { - KSimpleConfig config(TQString::tqfromLatin1(FILESHARECONF),true); + KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); m_ccgui->shareGrp->setChecked( config.readEntry("FILESHARING", "yes") == "yes" ); @@ -299,7 +299,7 @@ void KFileShareConfig::save() if ( ! file.open(IO_WriteOnly)) { KMessageBox::detailedError(this, i18n("Could not save settings."), - i18n("Could not open file '%1' for writing: %2").tqarg(FILESHARECONF).tqarg( + i18n("Could not open file '%1' for writing: %2").arg(FILESHARECONF).arg( file.errorString() ), i18n("Saving Failed")); return; diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp index 1efe2baa..a57d0f79 100644 --- a/filesharing/simple/groupconfigdlg.cpp +++ b/filesharing/simple/groupconfigdlg.cpp @@ -128,7 +128,7 @@ void GroupConfigDlg::slotAddUser() { if (allUsers.count()==0) { KMessageBox::information(this, i18n("All users are in the %1 group already.") - .tqarg(m_fileShareGroup.name())); + .arg(m_fileShareGroup.name())); return; } @@ -173,7 +173,7 @@ bool GroupConfigDlg::addUser(const KUser & user, const KUserGroup & group) { groups.append(group); if (!userMod(user.loginName(),groups)) { KMessageBox::sorry(this,i18n("Could not add user '%1' to group '%2'") - .tqarg(user.loginName()).tqarg(group.name())); + .arg(user.loginName()).arg(group.name())); return false; } return true; @@ -185,7 +185,7 @@ bool GroupConfigDlg::removeUser(const KUser & user, const KUserGroup & group) { groups.remove(group); if (!userMod(user.loginName(),groups)) { KMessageBox::sorry(this,i18n("Could not remove user '%1' from group '%2'") - .tqarg(user.loginName()).tqarg(group.name())); + .arg(user.loginName()).arg(group.name())); return false; } return true; @@ -333,9 +333,9 @@ void GroupConfigDlg::setFileShareGroup(const KUserGroup & group) { updateListBox(); m_gui->groupUsersRadio->setText( i18n("Only users of the '%1' group are allowed to share folders") - .tqarg(m_fileShareGroup.name())); + .arg(m_fileShareGroup.name())); m_gui->usersGrpBx->setTitle(i18n("Users of '%1' Group") - .tqarg(m_fileShareGroup.name())); + .arg(m_fileShareGroup.name())); m_gui->otherGroupBtn->setText(i18n("Change Group...")); m_gui->usersGrpBx->show(); } else { @@ -360,7 +360,7 @@ bool GroupConfigDlg::addUsersToGroup(TQValueList<KUser> users,const KUserGroup & bool GroupConfigDlg::emptyGroup(const TQString & s) { if (KMessageBox::No == KMessageBox::questionYesNo(this, - i18n("Do you really want to remove all users from group '%1'?").tqarg(s), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel())) { + i18n("Do you really want to remove all users from group '%1'?").arg(s), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel())) { return false; } @@ -377,7 +377,7 @@ bool GroupConfigDlg::emptyGroup(const TQString & s) { bool GroupConfigDlg::deleteGroup(const TQString & s) { if (KMessageBox::No == KMessageBox::questionYesNo(this, - i18n("Do you really want to delete group '%1'?").tqarg(s), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel())) { + i18n("Do you really want to delete group '%1'?").arg(s), TQString(), KStdGuiItem::del(), KStdGuiItem::cancel())) { return false; } @@ -385,7 +385,7 @@ bool GroupConfigDlg::deleteGroup(const TQString & s) { proc << "groupdel" << s; bool result = proc.start(KProcess::Block) && proc.normalExit(); if (!result) { - KMessageBox::sorry(this,i18n("Deleting group '%1' failed.").tqarg(s)); + KMessageBox::sorry(this,i18n("Deleting group '%1' failed.").arg(s)); } return result; @@ -398,7 +398,7 @@ bool GroupConfigDlg::createFileShareGroup(const TQString & s) { } if (KMessageBox::No == KMessageBox::questionYesNo(this, - i18n("This group '%1' does not exist. Should it be created?").tqarg(s), TQString(), i18n("Create"), i18n("Do Not Create"))) + i18n("This group '%1' does not exist. Should it be created?").arg(s), TQString(), i18n("Create"), i18n("Do Not Create"))) return false; //debug("CreateFileShareGroup: "+s); @@ -406,7 +406,7 @@ bool GroupConfigDlg::createFileShareGroup(const TQString & s) { proc << "groupadd" << s; bool result = proc.start(KProcess::Block) && proc.normalExit(); if (!result) { - KMessageBox::sorry(this,i18n("Creation of group '%1' failed.").tqarg(s)); + KMessageBox::sorry(this,i18n("Creation of group '%1' failed.").arg(s)); } else { setFileShareGroup(KUserGroup(s)); } diff --git a/filesharing/simple/groupconfiggui.ui b/filesharing/simple/groupconfiggui.ui index 7550cab0..13b26dc3 100644 --- a/filesharing/simple/groupconfiggui.ui +++ b/filesharing/simple/groupconfiggui.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -124,7 +124,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>20</height> diff --git a/filesharing/simple/krichtextlabel.cpp b/filesharing/simple/krichtextlabel.cpp index 3d9dfcd0..dd9268b6 100644 --- a/filesharing/simple/krichtextlabel.cpp +++ b/filesharing/simple/krichtextlabel.cpp @@ -19,7 +19,7 @@ #include "krichtextlabel.h" #include <tqtooltip.h> -#include <tqstylesheet.h> +#include <stylesheet.h> #include <tqsimplerichtext.h> #include <kglobalsettings.h> @@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - tqsetAlignment( TQt::WordBreak ); + setAlignment( TQt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5); - tqsetAlignment( TQt::WordBreak ); + setAlignment( TQt::WordBreak ); } void KRichTextLabel::setDefaultWidth(int defaultWidth) @@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -TQSize KRichTextLabel::tqminimumSizeHint() const +TQSize KRichTextLabel::minimumSizeHint() const { TQString qt_text = qrichtextify( text() ); int pref_width = 0; @@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const return TQSize(pref_width, rt.height()); } -TQSize KRichTextLabel::tqsizeHint() const +TQSize KRichTextLabel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KRichTextLabel::setText( const TQString &text ) { diff --git a/filesharing/simple/krichtextlabel.h b/filesharing/simple/krichtextlabel.h index 53a60cea..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 <[email protected]> */ @@ -46,8 +46,8 @@ public: int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; TQSizePolicy sizePolicy() const; public slots: |