summaryrefslogtreecommitdiffstats
path: root/kioslave
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:46:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:46:05 -0600
commit73c08b592db45af554b9f21029bc549d70f683ab (patch)
tree122898ea951e59fdc4419b3c84b7a6c2dd0bb5f7 /kioslave
parente81bdee8ae92d6eeb82daa8c0a0e46bf37f4a6da (diff)
downloadtdebase-73c08b592db45af554b9f21029bc549d70f683ab.tar.gz
tdebase-73c08b592db45af554b9f21029bc549d70f683ab.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kioslave')
-rw-r--r--kioslave/cgi/kcmcgi/kcmcgi.cpp2
-rw-r--r--kioslave/filter/filter.cc4
-rw-r--r--kioslave/finger/kio_finger.cpp2
-rw-r--r--kioslave/fish/fish.cpp2
-rw-r--r--kioslave/floppy/kio_floppy.cpp2
-rw-r--r--kioslave/info/info.cc2
-rw-r--r--kioslave/ldap/kio_ldap.cpp12
-rw-r--r--kioslave/mac/kio_mac.cpp8
-rw-r--r--kioslave/mac/kio_mac.h2
-rw-r--r--kioslave/man/kio_man.cpp16
-rw-r--r--kioslave/man/man2html.cpp4
-rw-r--r--kioslave/media/kcmodule/main.cpp2
-rw-r--r--kioslave/media/kcmodule/managermoduleview.ui2
-rw-r--r--kioslave/media/kcmodule/notifiermodule.cpp2
-rw-r--r--kioslave/media/kcmodule/notifiermoduleview.ui2
-rw-r--r--kioslave/media/kcmodule/serviceview.ui10
-rw-r--r--kioslave/media/kfile-plugin/kfilemediaplugin.cpp4
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp4
-rw-r--r--kioslave/media/medianotifier/notificationdialog.cpp4
-rw-r--r--kioslave/media/medianotifier/notificationdialogview.ui4
-rw-r--r--kioslave/media/mounthelper/decryptdialog.ui12
-rw-r--r--kioslave/media/propsdlgplugin/propertiespagegui.ui2
-rw-r--r--kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp2
-rw-r--r--kioslave/nfs/kio_nfs.cpp4
-rw-r--r--kioslave/pop3/pop3.cc24
-rw-r--r--kioslave/settings/kio_settings.cc6
-rw-r--r--kioslave/sftp/ksshprocess.cpp6
-rw-r--r--kioslave/smb/kio_smb.h2
-rw-r--r--kioslave/smb/kio_smb_auth.cpp2
-rw-r--r--kioslave/smb/kio_smb_browse.cpp10
-rw-r--r--kioslave/smb/kio_smb_config.cpp2
-rw-r--r--kioslave/smb/kio_smb_internal.cpp2
-rw-r--r--kioslave/smb/kio_smb_mount.cpp4
-rw-r--r--kioslave/smtp/capabilities.h2
-rw-r--r--kioslave/smtp/command.cc4
-rw-r--r--kioslave/smtp/interactivesmtpserver.cc4
-rw-r--r--kioslave/smtp/request.cc2
-rw-r--r--kioslave/tar/tar.cc10
-rw-r--r--kioslave/thumbnail/textcreator.cpp4
-rw-r--r--kioslave/trash/kio_trash.cpp6
-rw-r--r--kioslave/trash/trashimpl.cpp4
41 files changed, 102 insertions, 102 deletions
diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp
index d1a798aa..3d089397 100644
--- a/kioslave/cgi/kcmcgi/kcmcgi.cpp
+++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp
@@ -22,7 +22,7 @@
#include <kaboutdata.h>
#include <kfiledialog.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlistbox.h>
#include <tqpushbutton.h>
#include <tqgroupbox.h>
diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc
index 5ae1a886..8392dd16 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/finger/kio_finger.cpp b/kioslave/finger/kio_finger.cpp
index 4e62b6bb..77645b1b 100644
--- a/kioslave/finger/kio_finger.cpp
+++ b/kioslave/finger/kio_finger.cpp
@@ -21,7 +21,7 @@
#include <sys/stat.h>
#include <string.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdict.h>
#include <tqcstring.h>
#include <tqfile.h>
diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp
index 2f0210db..95c91dc2 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/floppy/kio_floppy.cpp b/kioslave/floppy/kio_floppy.cpp
index a0c68a9d..723a359a 100644
--- a/kioslave/floppy/kio_floppy.cpp
+++ b/kioslave/floppy/kio_floppy.cpp
@@ -36,7 +36,7 @@
#include <sys/time.h>
#include <sys/types.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqcstring.h>
#include <tqfile.h>
diff --git a/kioslave/info/info.cc b/kioslave/info/info.cc
index ab35f282..3a597443 100644
--- a/kioslave/info/info.cc
+++ b/kioslave/info/info.cc
@@ -4,7 +4,7 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqregexp.h>
#include <kdebug.h>
diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp
index 742d788b..46ce2e09 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: " <<
@@ -197,7 +197,7 @@ int LDAPProtocol::asyncSearch( LDAPUrl &usrc )
if ( count > 0 ) {
attrs = static_cast<char**>( malloc((count+1) * sizeof(char*)) );
for (int i=0; i<count; i++)
- attrs[i] = strdup( (*usrc.attributes().tqat(i)).utf8() );
+ attrs[i] = strdup( (*usrc.attributes().at(i)).utf8() );
attrs[count] = 0;
}
@@ -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 245af6fc..e64d22d6 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/mac/kio_mac.h b/kioslave/mac/kio_mac.h
index 7f74dfca..cf7ecd1b 100644
--- a/kioslave/mac/kio_mac.h
+++ b/kioslave/mac/kio_mac.h
@@ -24,7 +24,7 @@
#include <tqstring.h>
#include <tqcstring.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
class MacProtocol : public TQObject, public KIO::SlaveBase
{
diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp
index 7cec22c2..c8227e90 100644
--- a/kioslave/man/kio_man.cpp
+++ b/kioslave/man/kio_man.cpp
@@ -24,7 +24,7 @@
#include <tqdir.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqdatastream.h>
#include <tqcstring.h>
#include <tqptrlist.h>
@@ -82,7 +82,7 @@ bool parseUrl(const TQString& _url, TQString &title, TQString &section)
section = TQString::null;
TQString url = _url;
- if (url.tqat(0) == '/') {
+ if (url.at(0) == '/') {
if (KStandardDirs::exists(url)) {
title = url;
return true;
@@ -93,7 +93,7 @@ bool parseUrl(const TQString& _url, TQString &title, TQString &section)
}
}
- while (url.tqat(0) == '/')
+ while (url.at(0) == '/')
url.remove(0,1);
title = url;
@@ -259,7 +259,7 @@ TQStringList MANProtocol::findPages(const TQString &_section,
TQStringList list;
// kdDebug() << "findPages '" << section << "' '" << title << "'\n";
- if (title.tqat(0) == '/') {
+ if (title.at(0) == '/') {
list.append(title);
return list;
}
@@ -279,7 +279,7 @@ TQStringList MANProtocol::findPages(const TQString &_section,
// Section given as argument
//
sect_list += section;
- while (section.tqat(section.length() - 1).isLetter()) {
+ while (section.at(section.length() - 1).isLetter()) {
section.truncate(section.length() - 1);
sect_list += section;
}
@@ -400,11 +400,11 @@ void MANProtocol::output(const char *insert)
{
m_outputBuffer.writeBlock(insert,strlen(insert));
}
- if (!insert || m_outputBuffer.tqat() >= 2048)
+ if (!insert || m_outputBuffer.at() >= 2048)
{
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/man/man2html.cpp b/kioslave/man/man2html.cpp
index e31fe0fe..c7c41bc4 100644
--- a/kioslave/man/man2html.cpp
+++ b/kioslave/man/man2html.cpp
@@ -144,7 +144,7 @@
# define kdDebug(x) cerr
# define kdWarning(x) cerr << "WARNING "
#else
-# include <tqtextcodec.h>
+# include <textcodec.h>
# include <kdebug.h>
# include <tdeversion.h>
#endif
@@ -1905,7 +1905,7 @@ public:
return (index >= 0) && (index < (int)items.count());
}
TABLEITEM &at(int index) {
- return *items.tqat(index);
+ return *items.at(index);
}
TABLEROW *copyLayout() const;
diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp
index da52ea11..9a6f86ff 100644
--- a/kioslave/media/kcmodule/main.cpp
+++ b/kioslave/media/kcmodule/main.cpp
@@ -20,7 +20,7 @@
#include "main.h"
#include <tqtabwidget.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <kaboutdata.h>
diff --git a/kioslave/media/kcmodule/managermoduleview.ui b/kioslave/media/kcmodule/managermoduleview.ui
index d5d42a06..8a088f7c 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/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp
index d5e36cc5..1035662d 100644
--- a/kioslave/media/kcmodule/notifiermodule.cpp
+++ b/kioslave/media/kcmodule/notifiermodule.cpp
@@ -21,7 +21,7 @@
#include <klocale.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kcombobox.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/kioslave/media/kcmodule/notifiermoduleview.ui b/kioslave/media/kcmodule/notifiermoduleview.ui
index 50f93bc4..ad508c03 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 6ae35769..a6c3063f 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/kfile-plugin/kfilemediaplugin.cpp b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
index 580a678b..2de8a44f 100644
--- a/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
+++ b/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
@@ -140,7 +140,7 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
group = appendGroup(info, "mediumSummary");
- appendItem(group, "percent", TQString("%1%").tqarg(percent));
+ appendItem(group, "percent", TQString("%1%").arg(percent));
TQPixmap bar(150, 20);
TQPainter p(&bar);
@@ -148,7 +148,7 @@ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
p.fillRect(0, 0, length, 20, Qt::red);
p.fillRect(length, 0, 150-length, 20, Qt::green);
- TQColorGroup cg = TQApplication::tqpalette().active();
+ TQColorGroup cg = TQApplication::palette().active();
TQApplication::tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &p,
TQRect(0, 0, 150, 20), cg,
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index 58e2992e..1452b14c 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <kprocess.h>
#include <kconfig.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
#include <kmountpoint.h>
#include <kmessagebox.h>
#include <kio/job.h>
@@ -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 9913f033..508af981 100644
--- a/kioslave/media/medianotifier/notificationdialog.cpp
+++ b/kioslave/media/medianotifier/notificationdialog.cpp
@@ -18,7 +18,7 @@
*/
#include "notificationdialog.h"
-#include <tqlayout.h>
+#include <layout.h>
#include <krun.h>
#include <klocale.h>
@@ -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 032ea1f1..f7bd744b 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 dfb8c17d..939f0a36 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>
@@ -70,7 +70,7 @@
<property name="scaledContents">
<bool>true</bool>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>41</height>
@@ -109,7 +109,7 @@
<string>&lt;p&gt;&lt;b&gt;%1&lt;/b&gt; is an encrypted storage device.&lt;/p&gt;
&lt;p&gt;Please enter the password to decrypt the storage device.&lt;/p&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -189,7 +189,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui b/kioslave/media/propsdlgplugin/propertiespagegui.ui
index 3c98e1eb..51ead3a2 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/media/propsdlgplugin/propsdlgshareplugin.cpp b/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
index 59433a5d..a3e237c4 100644
--- a/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
@@ -19,7 +19,7 @@
#include <tqstring.h>
#include <tqvbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqtimer.h>
diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp
index d4a595c1..6e6d5b31 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 8782fb80..0ab27f63 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 ) {
@@ -857,7 +857,7 @@ void POP3Protocol::get(const KURL & url)
TQString cmd, path = url.path();
int maxCommands = (metaData("pipelining") == "on") ? MAX_COMMANDS : 1;
- if (path.tqat(0) == '/')
+ if (path.at(0) == '/')
path.remove(0, 1);
if (path.isEmpty()) {
POP3_DEBUG << "We should be a dir!!" << endl;
@@ -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);
@@ -1207,7 +1207,7 @@ void POP3Protocol::stat(const KURL & url)
{
TQString _path = url.path();
- if (_path.tqat(0) == '/')
+ if (_path.at(0) == '/')
_path.remove(0, 1);
UDSEntry entry;
@@ -1244,7 +1244,7 @@ void POP3Protocol::del(const KURL & url, bool /*isfile */ )
}
TQString _path = url.path();
- if (_path.tqat(0) == '/') {
+ if (_path.at(0) == '/') {
_path.remove(0, 1);
}
diff --git a/kioslave/settings/kio_settings.cc b/kioslave/settings/kio_settings.cc
index a525b028..b58c8b5d 100644
--- a/kioslave/settings/kio_settings.cc
+++ b/kioslave/settings/kio_settings.cc
@@ -20,7 +20,7 @@
#include <kio/slavebase.h>
#include <kinstance.h>
#include <kdebug.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <klocale.h>
#include <sys/stat.h>
#include <dcopclient.h>
@@ -127,7 +127,7 @@ KServiceGroup::Ptr SettingsProtocol::findGroup(const TQString &relPath)
kdDebug() << "Trying harder to find group " << relPath << endl;
for (unsigned int i=0; i<rest.count(); i++)
- kdDebug() << "Item (" << *rest.tqat(i) << ")" << endl;
+ kdDebug() << "Item (" << *rest.at(i) << ")" << endl;
while (!rest.isEmpty()) {
KServiceGroup::Ptr tmp = KServiceGroup::group(alreadyFound);
@@ -251,7 +251,7 @@ void SettingsProtocol::listDir(const KURL& url)
continue;
// Ignore dotfiles.
- if ((g->name().tqat(0) == '.'))
+ if ((g->name().at(0) == '.'))
continue;
TQString relPath = g->relPath();
diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp
index e923fe69..2ccab59b 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.h b/kioslave/smb/kio_smb.h
index da40bda1..581f6667 100644
--- a/kioslave/smb/kio_smb.h
+++ b/kioslave/smb/kio_smb.h
@@ -42,7 +42,7 @@
#include <tqstring.h>
#include <tqptrlist.h>
#include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqstrlist.h>
//--------------
diff --git a/kioslave/smb/kio_smb_auth.cpp b/kioslave/smb/kio_smb_auth.cpp
index 1d2ff05e..d4a48239 100644
--- a/kioslave/smb/kio_smb_auth.cpp
+++ b/kioslave/smb/kio_smb_auth.cpp
@@ -121,7 +121,7 @@ bool SMBSlave::checkPassword(SMBUrl &url)
int index = share.find('/', 1);
if (index > 1)
share = share.left(index);
- if (share.tqat(0) == '/')
+ if (share.at(0) == '/')
share = share.mid(1);
info.url.setPath("/" + share);
info.verifyPath = true;
diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp
index d8ac6d60..7bd73124 100644
--- a/kioslave/smb/kio_smb_browse.cpp
+++ b/kioslave/smb/kio_smb_browse.cpp
@@ -34,7 +34,7 @@
#include <pwd.h>
#include <grp.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kglobal.h>
@@ -199,7 +199,7 @@ KURL SMBSlave::checkURL(const KURL& kurl) const
if (surl.length() == 5) // just the above
return kurl; // unchanged
- if (surl.tqat(5) != '/') {
+ if (surl.at(5) != '/') {
surl = "smb://" + surl.mid(5);
kdDebug(KIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl;
return KURL(surl);
@@ -349,7 +349,7 @@ void SMBSlave::listDir( const KURL& kurl )
TQString comment = TQString::fromUtf8( dirp->comment );
if ( dirp->smbc_type == SMBC_SERVER || dirp->smbc_type == SMBC_WORKGROUP ) {
atom.m_str = dirpName.lower();
- atom.m_str.tqat( 0 ) = dirpName.tqat( 0 ).upper();
+ atom.m_str.at( 0 ) = dirpName.at( 0 ).upper();
if ( !comment.isEmpty() && dirp->smbc_type == SMBC_SERVER )
atom.m_str += " (" + comment + ")";
} else
@@ -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/smb/kio_smb_config.cpp b/kioslave/smb/kio_smb_config.cpp
index 101ba160..c887a72f 100644
--- a/kioslave/smb/kio_smb_config.cpp
+++ b/kioslave/smb/kio_smb_config.cpp
@@ -33,7 +33,7 @@
#include "kio_smb_internal.h"
#include <kconfig.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
//===========================================================================
void SMBSlave::reparseConfiguration()
{
diff --git a/kioslave/smb/kio_smb_internal.cpp b/kioslave/smb/kio_smb_internal.cpp
index 3660e3e8..e0da0219 100644
--- a/kioslave/smb/kio_smb_internal.cpp
+++ b/kioslave/smb/kio_smb_internal.cpp
@@ -31,7 +31,7 @@
#include "kio_smb.h"
#include "kio_smb_internal.h"
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <kconfig.h>
#include <kglobal.h>
diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp
index a3177b5c..f9c36623 100644
--- a/kioslave/smb/kio_smb_mount.cpp
+++ b/kioslave/smb/kio_smb_mount.cpp
@@ -54,8 +54,8 @@ void SMBSlave::special( const TQByteArray & data)
TQString share,host;
if (sl.count()>=2)
{
- host=(*sl.tqat(0)).mid(2);
- share=(*sl.tqat(1));
+ host=(*sl.at(0)).mid(2);
+ share=(*sl.at(1));
kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl;
}
diff --git a/kioslave/smtp/capabilities.h b/kioslave/smtp/capabilities.h
index 919633d6..9f946410 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 41c9cf78..2771baf8 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/smtp/interactivesmtpserver.cc b/kioslave/smtp/interactivesmtpserver.cc
index 50cd6f03..ea2873b8 100644
--- a/kioslave/smtp/interactivesmtpserver.cc
+++ b/kioslave/smtp/interactivesmtpserver.cc
@@ -38,11 +38,11 @@
#include <tqwidget.h>
#include <tqapplication.h>
#include <tqhostaddress.h>
-#include <tqtextedit.h>
+#include <textedit.h>
#include <tqlineedit.h>
#include <tqlabel.h>
#include <tqstring.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <cassert>
diff --git a/kioslave/smtp/request.cc b/kioslave/smtp/request.cc
index 05f8bdc9..84a1663f 100644
--- a/kioslave/smtp/request.cc
+++ b/kioslave/smtp/request.cc
@@ -93,7 +93,7 @@ namespace KioSMTP {
static bool isUsAscii( const TQString & s ) {
for ( uint i = 0 ; i < s.length() ; ++i )
- if ( s[i].tqunicode() > 127 ) return false;
+ if ( s[i].unicode() > 127 ) return false;
return true;
}
diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc
index 2079666a..2c3de021 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));
@@ -504,7 +504,7 @@ void ArchiveProtocol::get( const KURL & url )
if ( !firstRead )
{
bufferSize = kMin( maxSize, fileSize );
- buffer.tqresize( bufferSize, TQGArray::SpeedOptim );
+ buffer.resize( bufferSize, TQGArray::SpeedOptim );
}
const TQ_LONG read = io->readBlock( buffer.data(), buffer.size() ); // Avoid to use bufferSize here, in case something went wrong.
if ( read != bufferSize )
diff --git a/kioslave/thumbnail/textcreator.cpp b/kioslave/thumbnail/textcreator.cpp
index 749dd481..322c944a 100644
--- a/kioslave/thumbnail/textcreator.cpp
+++ b/kioslave/thumbnail/textcreator.cpp
@@ -158,13 +158,13 @@ bool TextCreator::create(const TQString &path, int width, int height, TQImage &i
}
// check for newlines in the text (unix,dos)
- TQChar ch = text.tqat( i );
+ TQChar ch = text.at( i );
if ( ch == '\n' )
{
newLine = true;
continue;
}
- else if ( ch == '\r' && text.tqat(i+1) == '\n' )
+ else if ( ch == '\r' && text.at(i+1) == '\n' )
{
newLine = true;
i++; // skip the next character (\n) as well
diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp
index 4d4330ea..07cdaec2 100644
--- a/kioslave/trash/kio_trash.cpp
+++ b/kioslave/trash/kio_trash.cpp
@@ -30,7 +30,7 @@
#include <dcopclient.h>
#include <tqdatastream.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tqfile.h>
#include <tqeventloop.h>
@@ -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 8718dfe5..696d6d30 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 );