summaryrefslogtreecommitdiffstats
path: root/kioslave
diff options
context:
space:
mode:
Diffstat (limited to 'kioslave')
-rw-r--r--kioslave/filter/filter.cc4
-rw-r--r--kioslave/fish/fish.cpp2
-rw-r--r--kioslave/ldap/kio_ldap.cpp10
-rw-r--r--kioslave/mac/kio_mac.cpp8
-rw-r--r--kioslave/man/kio_man.cpp4
-rw-r--r--kioslave/media/kcmodule/managermoduleview.ui2
-rw-r--r--kioslave/media/kcmodule/notifiermoduleview.ui2
-rw-r--r--kioslave/media/kcmodule/serviceview.ui10
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp2
-rw-r--r--kioslave/media/medianotifier/notificationdialog.cpp2
-rw-r--r--kioslave/media/medianotifier/notificationdialogview.ui4
-rw-r--r--kioslave/media/mounthelper/decryptdialog.ui6
-rw-r--r--kioslave/media/propsdlgplugin/propertiespagegui.ui2
-rw-r--r--kioslave/nfs/kio_nfs.cpp4
-rw-r--r--kioslave/pop3/pop3.cc18
-rw-r--r--kioslave/sftp/ksshprocess.cpp6
-rw-r--r--kioslave/smb/kio_smb_browse.cpp4
-rw-r--r--kioslave/smtp/capabilities.h2
-rw-r--r--kioslave/smtp/command.cc4
-rw-r--r--kioslave/tar/tar.cc8
-rw-r--r--kioslave/trash/kio_trash.cpp4
-rw-r--r--kioslave/trash/trashimpl.cpp4
22 files changed, 56 insertions, 56 deletions
diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc
index 5ae1a8867..8392dd160 100644
--- a/kioslave/filter/filter.cc
+++ b/kioslave/filter/filter.cc
@@ -56,7 +56,7 @@ int kdemain( int argc, char ** argv)
FilterProtocol::FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app )
: KIO::SlaveBase( protocol, pool, app )
{
- TQString mimetype = TQString::tqfromLatin1("application/x-") + TQString::tqfromLatin1(protocol);
+ TQString mimetype = TQString::fromLatin1("application/x-") + TQString::fromLatin1(protocol);
filter = KFilterBase::findFilterByMimeType( mimetype );
Q_ASSERT(filter);
}
@@ -157,7 +157,7 @@ void FilterProtocol::get( const KURL & )
void FilterProtocol::put( const KURL &/*url*/, int, bool /*_overwrite*/, bool /*_resume*/ )
{
- error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("put"));
+ error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("put"));
}
void FilterProtocol::setSubURL(const KURL &url)
diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp
index 2f0210dbd..95c91dc2c 100644
--- a/kioslave/fish/fish.cpp
+++ b/kioslave/fish/fish.cpp
@@ -1436,7 +1436,7 @@ void fishProtocol::run() {
if (rc > 0) {
int noff = received(buf,rc+offset);
if (noff > 0) memmove(buf,buf+offset+rc-noff,noff);
- //myDebug( << "left " << noff << " bytes: " << TQString::tqfromLatin1(buf,offset) << endl);
+ //myDebug( << "left " << noff << " bytes: " << TQString::fromLatin1(buf,offset) << endl);
offset = noff;
} else {
if (errno == EINTR)
diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp
index 742d788bf..a64340b8f 100644
--- a/kioslave/ldap/kio_ldap.cpp
+++ b/kioslave/ldap/kio_ldap.cpp
@@ -166,8 +166,8 @@ void LDAPProtocol::controlsFromMetaData( LDAPControl ***serverctrls,
{
TQString oid; bool critical; TQByteArray value;
int i = 0;
- while ( hasMetaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ) ) {
- TQCString val = metaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ).utf8();
+ while ( hasMetaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ) ) {
+ TQCString val = metaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ).utf8();
LDIF::splitControl( val, oid, critical, value );
kdDebug(7125) << "server ctrl #" << i << " value: " << val <<
" oid: " << oid << " critical: " << critical << " value: " <<
@@ -176,8 +176,8 @@ void LDAPProtocol::controlsFromMetaData( LDAPControl ***serverctrls,
i++;
}
i = 0;
- while ( hasMetaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ) ) {
- TQCString val = metaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ).utf8();
+ while ( hasMetaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ) ) {
+ TQCString val = metaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ).utf8();
LDIF::splitControl( val, oid, critical, value );
kdDebug(7125) << "client ctrl #" << i << " value: " << val <<
" oid: " << oid << " critical: " << critical << " value: " <<
@@ -519,7 +519,7 @@ void LDAPProtocol::fillAuthInfo( AuthInfo &info )
info.url.setPort( mPort );
info.url.setUser( mUser );
info.caption = i18n("LDAP Login");
- info.comment = TQString::tqfromLatin1( mProtocol ) + "://" + mHost + ":" +
+ info.comment = TQString::fromLatin1( mProtocol ) + "://" + mHost + ":" +
TQString::number( mPort );
info.commentLabel = i18n("site:");
info.username = mAuthSASL ? mUser : mBindName;
diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp
index 245af6fcf..e64d22d65 100644
--- a/kioslave/mac/kio_mac.cpp
+++ b/kioslave/mac/kio_mac.cpp
@@ -455,12 +455,12 @@ int MacProtocol::makeTime(TQString mday, TQString mon, TQString third) {
// otherwise it only prints the year
TQRegExp hourMin("(..):(..)");
if (hourMin.exactMatch(third)) {
- TQDate tqcurrentDate(TQDate::currentDate());
+ TQDate currentDate(TQDate::currentDate());
- if (month > tqcurrentDate.month()) {
- year = tqcurrentDate.year() - 1;
+ if (month > currentDate.month()) {
+ year = currentDate.year() - 1;
} else {
- year = tqcurrentDate.year();
+ year = currentDate.year();
}
TQString h(hourMin.cap(1));
TQString m(hourMin.cap(2));
diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp
index 7cec22c27..c94c9b2c6 100644
--- a/kioslave/man/kio_man.cpp
+++ b/kioslave/man/kio_man.cpp
@@ -404,7 +404,7 @@ void MANProtocol::output(const char *insert)
{
m_outputBuffer.close();
data(m_outputBuffer.buffer());
- m_outputBuffer.tqsetBufferFromCopy(TQByteArray());
+ m_outputBuffer.setBuffer(TQByteArray());
m_outputBuffer.open(IO_WriteOnly);
}
}
@@ -505,7 +505,7 @@ void MANProtocol::get(const KURL& url )
m_outputBuffer.close();
data(m_outputBuffer.buffer());
- m_outputBuffer.tqsetBufferFromCopy(TQByteArray());
+ m_outputBuffer.setBuffer(TQByteArray());
// tell we are done
data(TQByteArray());
}
diff --git a/kioslave/media/kcmodule/managermoduleview.ui b/kioslave/media/kcmodule/managermoduleview.ui
index d5d42a066..8a088f7cf 100644
--- a/kioslave/media/kcmodule/managermoduleview.ui
+++ b/kioslave/media/kcmodule/managermoduleview.ui
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>360</height>
diff --git a/kioslave/media/kcmodule/notifiermoduleview.ui b/kioslave/media/kcmodule/notifiermoduleview.ui
index 50f93bc40..ad508c03d 100644
--- a/kioslave/media/kcmodule/notifiermoduleview.ui
+++ b/kioslave/media/kcmodule/notifiermoduleview.ui
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>101</height>
diff --git a/kioslave/media/kcmodule/serviceview.ui b/kioslave/media/kcmodule/serviceview.ui
index 6ae357699..a6c3063f6 100644
--- a/kioslave/media/kcmodule/serviceview.ui
+++ b/kioslave/media/kcmodule/serviceview.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>640</width>
<height>480</height>
@@ -80,13 +80,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>40</width>
<height>40</height>
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -147,7 +147,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>21</height>
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index 58e2992e0..a4571fa46 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -447,7 +447,7 @@ const char* HALBackend::findMediumUdiFromUdi(const char* udi)
void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification)
{
kdDebug(1219) << "HALBackend::setProperties" << endl;
- if ( TQString::tqfromLatin1( mediumUdi ).startsWith( "/org/kde/" ) )
+ if ( TQString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) )
{
const Medium *cmedium = m_mediaList.findById(mediumUdi);
if ( cmedium )
diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/kioslave/media/medianotifier/notificationdialog.cpp
index 9913f033d..7ba172601 100644
--- a/kioslave/media/medianotifier/notificationdialog.cpp
+++ b/kioslave/media/medianotifier/notificationdialog.cpp
@@ -53,7 +53,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
updateActionsListBox();
- resize( TQSize(400,400).expandedTo( tqminimumSizeHint() ) );
+ resize( TQSize(400,400).expandedTo( minimumSizeHint() ) );
m_actionWatcher = new KDirWatch();
diff --git a/kioslave/media/medianotifier/notificationdialogview.ui b/kioslave/media/medianotifier/notificationdialogview.ui
index 032ea1f10..f7bd744be 100644
--- a/kioslave/media/medianotifier/notificationdialogview.ui
+++ b/kioslave/media/medianotifier/notificationdialogview.ui
@@ -42,13 +42,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>64</width>
<height>64</height>
diff --git a/kioslave/media/mounthelper/decryptdialog.ui b/kioslave/media/mounthelper/decryptdialog.ui
index dfb8c17d0..1de859542 100644
--- a/kioslave/media/mounthelper/decryptdialog.ui
+++ b/kioslave/media/mounthelper/decryptdialog.ui
@@ -55,13 +55,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32</height>
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>41</height>
diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui b/kioslave/media/propsdlgplugin/propertiespagegui.ui
index 3c98e1eb7..51ead3a25 100644
--- a/kioslave/media/propsdlgplugin/propertiespagegui.ui
+++ b/kioslave/media/propsdlgplugin/propertiespagegui.ui
@@ -352,7 +352,7 @@ Display the short name as is; store a long name when the short name is not all u
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp
index d4a595c16..6e6d5b312 100644
--- a/kioslave/nfs/kio_nfs.cpp
+++ b/kioslave/nfs/kio_nfs.cpp
@@ -807,7 +807,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString&
struct passwd *user = getpwuid( uid );
if ( user )
{
- m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) );
+ m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) );
atom.m_str = user->pw_name;
}
else
@@ -825,7 +825,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString&
struct group *grp = getgrgid( gid );
if ( grp )
{
- m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) );
+ m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) );
atom.m_str = grp->gr_name;
}
else
diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc
index 8782fb80b..300f5fe32 100644
--- a/kioslave/pop3/pop3.cc
+++ b/kioslave/pop3/pop3.cc
@@ -242,8 +242,8 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len,
QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4)));
}
- TQString command = TQString::tqfromLatin1(cmd);
- TQString serverMsg = TQString::tqfromLatin1(buf).mid(5).stripWhiteSpace();
+ TQString command = TQString::fromLatin1(cmd);
+ TQString serverMsg = TQString::fromLatin1(buf).mid(5).stripWhiteSpace();
if (command.left(4) == "PASS") {
command = i18n("PASS <your password>");
@@ -353,7 +353,7 @@ int POP3Protocol::loginAPOP( char *challenge, KIO::AuthInfo &ai )
{
char buf[512];
- TQString apop_string = TQString::tqfromLatin1("APOP ");
+ TQString apop_string = TQString::fromLatin1("APOP ");
if (m_sUser.isEmpty() || m_sPass.isEmpty()) {
// Prompt for usernames
if (!openPassDlg(ai)) {
@@ -461,7 +461,7 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
{
#ifdef HAVE_LIBSASL2
char buf[512];
- TQString sasl_buffer = TQString::tqfromLatin1("AUTH");
+ TQString sasl_buffer = TQString::fromLatin1("AUTH");
int result;
sasl_conn_t *conn = NULL;
@@ -525,13 +525,13 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
TQByteArray challenge, tmp;
- TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mechusing );
+ TQString firstCommand = "AUTH " + TQString::fromLatin1( mechusing );
challenge.setRawData( out, outlen );
KCodecs::base64Encode( challenge, tmp );
challenge.resetRawData( out, outlen );
if ( !tmp.isEmpty() ) {
firstCommand += " ";
- firstCommand += TQString::tqfromLatin1( tmp.data(), tmp.size() );
+ firstCommand += TQString::fromLatin1( tmp.data(), tmp.size() );
}
challenge.resize( 2049 );
@@ -624,7 +624,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai )
m_sOldUser = m_sUser;
m_sOldPass = m_sPass;
- TQString one_string = TQString::tqfromLatin1("USER ");
+ TQString one_string = TQString::fromLatin1("USER ");
one_string.append( m_sUser );
if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) {
@@ -638,7 +638,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai )
return false;
}
- one_string = TQString::tqfromLatin1("PASS ");
+ one_string = TQString::fromLatin1("PASS ");
one_string.append(m_sPass);
if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) {
@@ -1176,7 +1176,7 @@ void POP3Protocol::listDir(const KURL &)
uds_url.setUser(m_sUser);
uds_url.setPass(m_sPass);
uds_url.setHost(m_sServer);
- uds_url.setPath(TQString::tqfromLatin1("/download/%1").arg(i + 1));
+ uds_url.setPath(TQString::fromLatin1("/download/%1").arg(i + 1));
atom.m_str = uds_url.url();
atom.m_long = 0;
entry.append(atom);
diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp
index e923fe69e..2ccab59b7 100644
--- a/kioslave/sftp/ksshprocess.cpp
+++ b/kioslave/sftp/ksshprocess.cpp
@@ -206,7 +206,7 @@ void KSshProcess::removeSignalHandlers() {
KSshProcess::KSshProcess()
: mVersion(UNKNOWN_VER), mConnected(false),
mRunning(false), mConnectState(0) {
- mSshPath = KStandardDirs::findExe(TQString::tqfromLatin1("ssh"));
+ mSshPath = KStandardDirs::findExe(TQString::fromLatin1("ssh"));
kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" <<
mSshPath << "]" << endl;
@@ -292,7 +292,7 @@ TQString KSshProcess::versionStr() {
return TQString::null;
}
- return TQString::tqfromLatin1(versionStrs[mVersion]);
+ return TQString::fromLatin1(versionStrs[mVersion]);
}
*/
@@ -776,7 +776,7 @@ bool KSshProcess::connect() {
i18n("Error encountered while talking to ssh.");
mConnectState = STATE_FATAL;
}
- else if( line.find(TQString::tqfromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) {
+ else if( line.find(TQString::fromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) {
mConnectState = STATE_TRY_PASSWD;
}
else if( line.find(passphrasePrompt[mVersion]) != -1 ) {
diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp
index d8ac6d60d..b79f95fc1 100644
--- a/kioslave/smb/kio_smb_browse.cpp
+++ b/kioslave/smb/kio_smb_browse.cpp
@@ -409,7 +409,7 @@ void SMBSlave::listDir( const KURL& kurl )
udsentry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE;
- atom.m_str = TQString::tqfromLatin1("application/x-smb-server");
+ atom.m_str = TQString::fromLatin1("application/x-smb-server");
udsentry.append(atom);
}
@@ -429,7 +429,7 @@ void SMBSlave::listDir( const KURL& kurl )
udsentry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE;
- atom.m_str = TQString::tqfromLatin1("application/x-smb-workgroup");
+ atom.m_str = TQString::fromLatin1("application/x-smb-workgroup");
udsentry.append(atom);
atom.m_uds = KIO::UDS_URL;
diff --git a/kioslave/smtp/capabilities.h b/kioslave/smtp/capabilities.h
index 919633d64..9f9464104 100644
--- a/kioslave/smtp/capabilities.h
+++ b/kioslave/smtp/capabilities.h
@@ -57,7 +57,7 @@ namespace KioSMTP {
return mCapabilities.find( cap.upper() ) != mCapabilities.end();
}
bool have( const TQCString & cap ) const { return have( TQString( cap.data() ) ); }
- bool have( const char * cap ) const { return have( TQString::tqfromLatin1( cap ) ); }
+ bool have( const char * cap ) const { return have( TQString::fromLatin1( cap ) ); }
TQString asMetaDataString() const;
diff --git a/kioslave/smtp/command.cc b/kioslave/smtp/command.cc
index 41c9cf78a..2771baf82 100644
--- a/kioslave/smtp/command.cc
+++ b/kioslave/smtp/command.cc
@@ -321,14 +321,14 @@ static sasl_callback_t callbacks[] = {
cmd = mUngetSASLResponse;
mUngetSASLResponse = 0;
} else if ( mFirstTime ) {
- TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mMechusing );
+ TQString firstCommand = "AUTH " + TQString::fromLatin1( mMechusing );
tmp.setRawData( mOut, mOutlen );
KCodecs::base64Encode( tmp, challenge );
tmp.resetRawData( mOut, mOutlen );
if ( !challenge.isEmpty() ) {
firstCommand += " ";
- firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() );
+ firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
}
cmd = firstCommand.latin1();
diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc
index 2079666a0..6339f1ee3 100644
--- a/kioslave/tar/tar.cc
+++ b/kioslave/tar/tar.cc
@@ -125,7 +125,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Erro
path.truncate( len - 1 );
}
else
- path = TQString::tqfromLatin1("/");
+ path = TQString::fromLatin1("/");
kdDebug(7109) << "Found. archiveFile=" << archiveFile << " path=" << path << endl;
break;
}
@@ -248,9 +248,9 @@ void ArchiveProtocol::listDir( const KURL & url )
if ( path.isEmpty() )
{
- KURL redir( url.protocol() + TQString::tqfromLatin1( ":/") );
+ KURL redir( url.protocol() + TQString::fromLatin1( ":/") );
kdDebug( 7109 ) << "url.path()==" << url.path() << endl;
- redir.setPath( url.path() + TQString::tqfromLatin1("/") );
+ redir.setPath( url.path() + TQString::fromLatin1("/") );
kdDebug( 7109 ) << "ArchiveProtocol::listDir: redirection " << redir.url() << endl;
redirection( redir );
finished();
@@ -360,7 +360,7 @@ void ArchiveProtocol::stat( const KURL & url )
const KArchiveEntry* archiveEntry;
if ( path.isEmpty() )
{
- path = TQString::tqfromLatin1( "/" );
+ path = TQString::fromLatin1( "/" );
archiveEntry = root;
} else {
path = TQString::fromLocal8Bit(remoteEncoding()->encode(path));
diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp
index 4d4330ea9..344f31f74 100644
--- a/kioslave/trash/kio_trash.cpp
+++ b/kioslave/trash/kio_trash.cpp
@@ -78,10 +78,10 @@ TrashProtocol::TrashProtocol( const TQCString& protocol, const TQCString &pool,
{
struct passwd *user = getpwuid( getuid() );
if ( user )
- m_userName = TQString::tqfromLatin1(user->pw_name);
+ m_userName = TQString::fromLatin1(user->pw_name);
struct group *grp = getgrgid( getgid() );
if ( grp )
- m_groupName = TQString::tqfromLatin1(grp->gr_name);
+ m_groupName = TQString::fromLatin1(grp->gr_name);
}
TrashProtocol::~TrashProtocol()
diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp
index 8718dfe5f..696d6d305 100644
--- a/kioslave/trash/trashimpl.cpp
+++ b/kioslave/trash/trashimpl.cpp
@@ -262,7 +262,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi
info += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1();
info += "\n";
info += "DeletionDate=";
- info += TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ).latin1();
+ info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1();
info += "\n";
size_t sz = info.size() - 1; // avoid trailing 0 from QCString
@@ -429,7 +429,7 @@ bool TrashImpl::directRename( const TQString& src, const TQString& dest )
kdDebug() << k_funcinfo << src << " -> " << dest << endl;
if ( ::rename( TQFile::encodeName( src ), TQFile::encodeName( dest ) ) != 0 ) {
if (errno == EXDEV) {
- error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("rename") );
+ error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename") );
} else {
if (( errno == EACCES ) || (errno == EPERM)) {
error( KIO::ERR_ACCESS_DENIED, dest );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-11 05:26:23 +0000