From 808e453c56036211f57482ed847d54aca01bba68 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:49:40 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- filesharing/advanced/nfs/hostprops.ui | 14 +++++++------- filesharing/advanced/nfs/nfsdialog.cpp | 6 +++--- filesharing/advanced/nfs/nfsdialoggui.ui | 2 +- filesharing/advanced/nfs/nfsentry.cpp | 4 ++-- filesharing/advanced/nfs/nfsentry.h | 2 +- filesharing/advanced/nfs/nfsfile.cpp | 6 +++--- filesharing/advanced/nfs/nfshostdlg.cpp | 10 +++++----- 7 files changed, 22 insertions(+), 22 deletions(-) (limited to 'filesharing/advanced/nfs') 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 @@ 0 - + 180 0 @@ -302,7 +302,7 @@ Early NFS client implementations did not send credentials with lock requests, an User Mapping - + AlignAuto @@ -348,7 +348,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap - tqlayout15 + layout15 @@ -380,7 +380,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap 0 - + 50 0 @@ -394,7 +394,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap - tqlayout16 + layout16 @@ -426,7 +426,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap 0 - + 50 0 @@ -450,7 +450,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap Expanding - + 20 16 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 #include #include -#include +#include #include #include @@ -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 Expanding - + 20 40 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 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 #include -#include +#include #include #include @@ -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 -#include +#include #include #include #include @@ -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; -- cgit v1.2.1