summaryrefslogtreecommitdiffstats
path: root/kio/tests
diff options
context:
space:
mode:
Diffstat (limited to 'kio/tests')
-rw-r--r--kio/tests/dataprotocoltest.cpp8
-rw-r--r--kio/tests/jobtest.cpp2
-rw-r--r--kio/tests/jobtest.h2
-rw-r--r--kio/tests/kacltest.cpp46
-rw-r--r--kio/tests/kdcopcheck.h2
-rw-r--r--kio/tests/kdefaultprogresstest.cpp4
-rw-r--r--kio/tests/kdirlistertest.cpp12
-rw-r--r--kio/tests/kdirlistertest.h2
-rw-r--r--kio/tests/kdirwatchunittest.cpp8
-rw-r--r--kio/tests/kioslavetest.cpp26
-rw-r--r--kio/tests/kioslavetest.h6
-rw-r--r--kio/tests/kmfitest.cpp4
-rw-r--r--kio/tests/kmimefromext.cpp2
-rw-r--r--kio/tests/kmimemagictest.cpp4
-rw-r--r--kio/tests/kprotocolinfotest.cpp2
-rw-r--r--kio/tests/ksycocatest.cpp2
-rw-r--r--kio/tests/kurifiltertest.cpp6
-rw-r--r--kio/tests/kurlcompletiontest.cpp16
-rw-r--r--kio/tests/previewtest.cpp8
-rw-r--r--kio/tests/speed.cpp10
20 files changed, 86 insertions, 86 deletions
diff --git a/kio/tests/dataprotocoltest.cpp b/kio/tests/dataprotocoltest.cpp
index c75615145..0c8470a61 100644
--- a/kio/tests/dataprotocoltest.cpp
+++ b/kio/tests/dataprotocoltest.cpp
@@ -47,7 +47,7 @@ public:
// meta_data[key] = value;
// cout << "§ " << key << " = " << value << endl;
TQString prefix = "Metadata[\""+key+"\"]: ";
- KIO::MetaData::Iterator it = attributes_expected.tqfind(key);
+ KIO::MetaData::Iterator it = attributes_expected.find(key);
if (it != attributes_expected.end()) {
testStrings(prefix,it.data(),value);
// remove key from map
@@ -59,7 +59,7 @@ public:
}
void sendMetaData() {
- // check here if attributes_expected tqcontains any excess keys
+ // check here if attributes_expected contains any excess keys
KIO::MetaData::ConstIterator it = attributes_expected.begin();
KIO::MetaData::ConstIterator end = attributes_expected.end();
for (; it != end; ++it) {
@@ -92,9 +92,9 @@ private:
// -- testcase related members
TQString mime_type_expected; // expected mime type
- /** tqcontains all attributes and values the testcase has to set */
+ /** contains all attributes and values the testcase has to set */
KIO::MetaData attributes_expected;
- /** tqcontains the content as it is expected to be returned */
+ /** contains the content as it is expected to be returned */
TQByteArray content_expected;
int passed; // # of passed tests
int total; // # of total tests
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 93b250075..9fe4b4c49 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -532,7 +532,7 @@ void JobTest::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst )
void JobTest::copyFileToSystem()
{
- if ( !KProtocolInfo::isKnownProtocol( TQString::tqfromLatin1( "system" ) ) ) {
+ if ( !KProtocolInfo::isKnownProtocol( TQString::fromLatin1( "system" ) ) ) {
kdDebug() << k_funcinfo << "no kio_system, skipping test" << endl;
return;
}
diff --git a/kio/tests/jobtest.h b/kio/tests/jobtest.h
index 83ec2da7c..533ffba8c 100644
--- a/kio/tests/jobtest.h
+++ b/kio/tests/jobtest.h
@@ -24,7 +24,7 @@
#include <tqobject.h>
#include <kio/job.h>
-class JobTest : public TQObject
+class JobTest : public QObject
{
Q_OBJECT
diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp
index 0f9ac9e7a..58ae319b2 100644
--- a/kio/tests/kacltest.cpp
+++ b/kio/tests/kacltest.cpp
@@ -80,22 +80,22 @@ int main(int argc, char *argv[])
}
#ifdef Q_OS_FREEBSD
-static const TQString s_group1 = TQString::tqfromLatin1("staff");
-static const TQString s_group2 = TQString::tqfromLatin1("guest");
+static const TQString s_group1 = TQString::fromLatin1("staff");
+static const TQString s_group2 = TQString::fromLatin1("guest");
#else
-static const TQString s_group1 = TQString::tqfromLatin1("audio");
-static const TQString s_group2 = TQString::tqfromLatin1("users");
+static const TQString s_group1 = TQString::fromLatin1("audio");
+static const TQString s_group2 = TQString::fromLatin1("users");
#endif
-static const TQString s_testACL = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ntqmask::rwx\nother::r--\n" );
-static const TQString s_testACL2 = TQString::tqfromLatin1( "user::rwx\nuser:bin:rwx\ngroup::rw-\n") +
- TQString::tqfromLatin1( "group:" ) + s_group1 + TQString::tqfromLatin1( ":--x\n" ) +
- TQString::tqfromLatin1( "group:" ) + s_group2 + TQString::tqfromLatin1( ":r--\n" ) +
- TQString::tqfromLatin1( "tqmask::r-x\nother::r--\n" );
-static const TQString s_testACLEffective = TQString::tqfromLatin1( "user::rwx\nuser:bin:rwx #effective:r-x\ngroup::rw- #effective:r--\n" ) +
- TQString::tqfromLatin1( "group:" ) + s_group1 + TQString::tqfromLatin1( ":--x\n" ) +
- TQString::tqfromLatin1( "group:" ) + s_group2 + TQString::tqfromLatin1( ":r--\n" ) +
- TQString::tqfromLatin1( "tqmask::r-x\nother::r--\n" );
+static const TQString s_testACL = TQString::fromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\nmask::rwx\nother::r--\n" );
+static const TQString s_testACL2 = TQString::fromLatin1( "user::rwx\nuser:bin:rwx\ngroup::rw-\n") +
+ TQString::fromLatin1( "group:" ) + s_group1 + TQString::fromLatin1( ":--x\n" ) +
+ TQString::fromLatin1( "group:" ) + s_group2 + TQString::fromLatin1( ":r--\n" ) +
+ TQString::fromLatin1( "mask::r-x\nother::r--\n" );
+static const TQString s_testACLEffective = TQString::fromLatin1( "user::rwx\nuser:bin:rwx #effective:r-x\ngroup::rw- #effective:r--\n" ) +
+ TQString::fromLatin1( "group:" ) + s_group1 + TQString::fromLatin1( ":--x\n" ) +
+ TQString::fromLatin1( "group:" ) + s_group2 + TQString::fromLatin1( ":r--\n" ) +
+ TQString::fromLatin1( "mask::r-x\nother::r--\n" );
KACLTest::KACLTest()
:m_acl( s_testACL )
@@ -163,8 +163,8 @@ void KACLTest::testGetOthersPermissions()
void KACLTest::testGetMaskPermissions()
{
bool exists = false;
- unsigned short tqmask = m_acl.tqmaskPermissions( exists );
- check( "Mask permissions: ", TQString::number( tqmask ), "7" );
+ unsigned short mask = m_acl.maskPermissions( exists );
+ check( "Mask permissions: ", TQString::number( mask ), "7" );
check( "Mask permissions: ", exists, true );
}
@@ -245,9 +245,9 @@ void KACLTest::testSettingExtended()
KACL CharlesII( s_testACL );
CharlesII.setMaskPermissions( 7 ); // clearly
bool dummy = false;
- check( "setMaskPermissions: ", TQString::number( CharlesII.tqmaskPermissions( dummy ) ),"7" );
+ check( "setMaskPermissions: ", TQString::number( CharlesII.maskPermissions( dummy ) ),"7" );
- const TQString expected( "user::rw-\nuser:root:rwx\nuser:bin:r--\ngroup::rw-\ntqmask::rwx\nother::r--\n" );
+ const TQString expected( "user::rw-\nuser:root:rwx\nuser:bin:r--\ngroup::rw-\nmask::rwx\nother::r--\n" );
ACLUserPermissionsList users;
ACLUserPermissions user = qMakePair( TQString( "root" ), ( unsigned short )7 );
@@ -265,8 +265,8 @@ void KACLTest::testSettingExtended()
// groups, all and named
- const TQString expected2 = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 +
- TQString::tqfromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::tqfromLatin1(":r--\ntqmask::rwx\nother::r--\n" );
+ const TQString expected2 = TQString::fromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 +
+ TQString::fromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::fromLatin1(":r--\nmask::rwx\nother::r--\n" );
CharlesII.setACL( s_testACL ); // reset
ACLGroupPermissionsList groups;
ACLGroupPermissions group = qMakePair( s_group1, ( unsigned short )3 );
@@ -300,10 +300,10 @@ void KACLTest::testNewMask()
{
KACL CharlesII( "user::rw-\ngroup::rw-\nother::rw\n" );
bool dummy = false;
- CharlesII.tqmaskPermissions( dummy );
- check( "tqmask exists: ", dummy, false );
+ CharlesII.maskPermissions( dummy );
+ check( "mask exists: ", dummy, false );
CharlesII.setMaskPermissions( 6 );
- check( "new tqmask set: ", TQString::number( CharlesII.tqmaskPermissions( dummy ) ), "6" );
- check( "tqmask exists now: ", dummy, true );
+ check( "new mask set: ", TQString::number( CharlesII.maskPermissions( dummy ) ), "6" );
+ check( "mask exists now: ", dummy, true );
}
diff --git a/kio/tests/kdcopcheck.h b/kio/tests/kdcopcheck.h
index 9a76e6246..c3572d929 100644
--- a/kio/tests/kdcopcheck.h
+++ b/kio/tests/kdcopcheck.h
@@ -5,7 +5,7 @@
#include <tqstring.h>
#include <tqobject.h>
-class TestService : public TQObject
+class TestService : public QObject
{
Q_OBJECT
public:
diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp
index c2a642c1f..a831041e1 100644
--- a/kio/tests/kdefaultprogresstest.cpp
+++ b/kio/tests/kdefaultprogresstest.cpp
@@ -18,7 +18,7 @@ int main(int argc, char **argv)
dlg->slotTotalDirs( 0L, 1 );
dlg->slotSpeed( 0L, 55 );
- dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Starting..." ) );
+ dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Starting..." ) );
int files = 0;
for ( int size = 0 ; size < 12000 ; size += 1 )
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
}
kapp->processEvents();
}
- dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Done." ) );
+ dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) );
delete dlg;
return 0;
diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp
index 73d526387..6137f5e71 100644
--- a/kio/tests/kdirlistertest.cpp
+++ b/kio/tests/kdirlistertest.cpp
@@ -36,18 +36,18 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name )
lister = new KDirLister( false /* true */ );
debug = new PrintSignals;
- TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+ TQVBoxLayout* layout = new TQVBoxLayout( this );
TQPushButton* startH = new TQPushButton( "Start listing $HOME", this );
TQPushButton* startR= new TQPushButton( "Start listing /", this );
TQPushButton* test = new TQPushButton( "Many", this );
TQPushButton* startT = new TQPushButton( "tarfile", this );
- tqlayout->addWidget( startH );
- tqlayout->addWidget( startR );
- tqlayout->addWidget( startT );
- tqlayout->addWidget( test );
- resize( tqlayout->tqsizeHint() );
+ layout->addWidget( startH );
+ layout->addWidget( startR );
+ layout->addWidget( startT );
+ layout->addWidget( test );
+ resize( layout->sizeHint() );
connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) );
connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) );
diff --git a/kio/tests/kdirlistertest.h b/kio/tests/kdirlistertest.h
index 27a04ee47..6b1e831f5 100644
--- a/kio/tests/kdirlistertest.h
+++ b/kio/tests/kdirlistertest.h
@@ -31,7 +31,7 @@
using namespace std;
-class PrintSignals : public TQObject
+class PrintSignals : public QObject
{
Q_OBJECT
public:
diff --git a/kio/tests/kdirwatchunittest.cpp b/kio/tests/kdirwatchunittest.cpp
index 870b85de9..1bd17edd6 100644
--- a/kio/tests/kdirwatchunittest.cpp
+++ b/kio/tests/kdirwatchunittest.cpp
@@ -26,7 +26,7 @@ void KDirWatchTest::VERIFY_NOTHING()
for (int i = 0; i < 20; ++i) {
usleep(100*1000);
- tqApp->processEvents();
+ qApp->processEvents();
}
bool nothing_failed = true;
@@ -47,7 +47,7 @@ void KDirWatchTest::VERIFY_DIRTY(const TQString& alert)
for (int i = 0; i < 20; ++i) {
usleep(100*1000);
- tqApp->processEvents();
+ qApp->processEvents();
}
VERIFY (m_s[sigCreated] == m_signals[sigCreated] &&
@@ -64,7 +64,7 @@ void KDirWatchTest::VERIFY_CREATED(const TQString& alert)
for (int i = 0; i < 20; ++i) {
usleep(100*1000);
- tqApp->processEvents();
+ qApp->processEvents();
}
VERIFY (m_s[sigDirty] == m_signals[sigDirty] &&
@@ -81,7 +81,7 @@ void KDirWatchTest::VERIFY_DELETED(const TQString& alert)
for (int i = 0; i < 20; ++i) {
usleep(100*1000);
- tqApp->processEvents();
+ qApp->processEvents();
}
VERIFY (m_s[sigDirty] == m_signals[sigDirty] &&
diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp
index e183fa23c..0db23457d 100644
--- a/kio/tests/kioslavetest.cpp
+++ b/kio/tests/kioslavetest.cpp
@@ -129,39 +129,39 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
progressButtons->insert( rbProgressDefault, ProgressDefault );
hbLayout->addWidget( rbProgressDefault, 5 );
- rbProgresstqStatus = new TQRadioButton( "tqStatus", progressButtons );
- progressButtons->insert( rbProgresstqStatus, ProgresstqStatus );
- hbLayout->addWidget( rbProgresstqStatus, 5 );
+ rbProgressStatus = new TQRadioButton( "Status", progressButtons );
+ progressButtons->insert( rbProgressStatus, ProgressStatus );
+ hbLayout->addWidget( rbProgressStatus, 5 );
progressButtons->setButton( pr );
changeProgressMode( pr );
// statusbar progress widget
- statusProgress = new tqStatusbarProgress( statusBar() );
+ statusProgress = new StatusbarProgress( statusBar() );
statusBar()->addWidget( statusProgress, 0, true );
// run & stop butons
hbLayout = new TQHBoxLayout( topLayout, 15 );
pbStart = new TQPushButton( "&Start", main_widget );
- pbStart->setFixedSize( pbStart->tqsizeHint() );
+ pbStart->setFixedSize( pbStart->sizeHint() );
connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) );
hbLayout->addWidget( pbStart, 5 );
pbStop = new TQPushButton( "Sto&p", main_widget );
- pbStop->setFixedSize( pbStop->tqsizeHint() );
+ pbStop->setFixedSize( pbStop->sizeHint() );
pbStop->setEnabled( false );
connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) );
hbLayout->addWidget( pbStop, 5 );
// close button
close = new TQPushButton( "&Close", main_widget );
- close->setFixedSize( close->tqsizeHint() );
+ close->setFixedSize( close->sizeHint() );
connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit()));
topLayout->addWidget( close, 5 );
- main_widget->setMinimumSize( main_widget->tqsizeHint() );
+ main_widget->setMinimumSize( main_widget->sizeHint() );
setCentralWidget( main_widget );
slave = 0;
@@ -201,7 +201,7 @@ void KioslaveTest::changeOperation( int id ) {
void KioslaveTest::changeProgressMode( int id ) {
progressMode = id;
- if ( progressMode == ProgresstqStatus ) {
+ if ( progressMode == ProgressStatus ) {
statusBar()->show();
} else {
statusBar()->hide();
@@ -306,7 +306,7 @@ void KioslaveTest::startJob() {
connect( job, TQT_SIGNAL( canceled( KIO::Job * ) ),
TQT_SLOT( slotResult( KIO::Job * ) ) );
- if (progressMode == ProgresstqStatus) {
+ if (progressMode == ProgressStatus) {
statusProgress->setJob( job );
}
@@ -537,15 +537,15 @@ int main(int argc, char **argv) {
} else if ( tmps == "default") {
pr = KioslaveTest::ProgressDefault;
} else if ( tmps == "status") {
- pr = KioslaveTest::ProgresstqStatus;
+ pr = KioslaveTest::ProgressStatus;
} else KCmdLineArgs::usage("unknown progress mode");
args->clear(); // Free up memory
KioslaveTest test( src, dest, op, pr );
test.show();
- // Bug in KTMW / Qt / tqlayouts ?
- test.resize( test.tqsizeHint() );
+ // Bug in KTMW / Qt / layouts ?
+ test.resize( test.sizeHint() );
app.setMainWidget(&test);
app.exec();
diff --git a/kio/tests/kioslavetest.h b/kio/tests/kioslavetest.h
index 1f99fbbdf..02fae7f23 100644
--- a/kio/tests/kioslavetest.h
+++ b/kio/tests/kioslavetest.h
@@ -35,7 +35,7 @@ public:
enum Operations { List, ListRecursive, Stat, Get, Put, Copy, Move, Delete, Shred, Mkdir, Mimetype };
- enum ProgressModes { ProgressNone, ProgressDefault, ProgresstqStatus };
+ enum ProgressModes { ProgressNone, ProgressDefault, ProgressStatus };
protected:
@@ -70,7 +70,7 @@ protected:
TQRadioButton *rbProgressNone;
TQRadioButton *rbProgressDefault;
- TQRadioButton *rbProgresstqStatus;
+ TQRadioButton *rbProgressStatus;
TQPushButton *pbStart;
TQPushButton *pbStop;
@@ -97,7 +97,7 @@ private:
KIO::Job *job;
TQWidget *main_widget;
- KIO::tqStatusbarProgress *statusProgress;
+ KIO::StatusbarProgress *statusProgress;
int selectedOperation;
int progressMode;
diff --git a/kio/tests/kmfitest.cpp b/kio/tests/kmfitest.cpp
index 83d5798a2..25e96759f 100644
--- a/kio/tests/kmfitest.cpp
+++ b/kio/tests/kmfitest.cpp
@@ -19,8 +19,8 @@ int main (int argc, char **argv)
TQString file = TQFile::decodeName(argv[i]);
qWarning("File: %s", file.local8Bit().data());
KMimeType::Ptr p;
- p = KMimeType::tqfindByPath(file);
- qWarning("Mime type (tqfindByPath): %s", p->name().latin1());
+ p = KMimeType::findByPath(file);
+ qWarning("Mime type (findByPath): %s", p->name().latin1());
KFileMetaInfo meta(file, TQString::null, KFileMetaInfo::TechnicalInfo | KFileMetaInfo::ContentInfo);
}
diff --git a/kio/tests/kmimefromext.cpp b/kio/tests/kmimefromext.cpp
index 4d2cbe67b..248407f95 100644
--- a/kio/tests/kmimefromext.cpp
+++ b/kio/tests/kmimefromext.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
// The "true" here means only the filename will be looked at.
// "Mime-magic" will not interfer. The file doesn't exist.
// TODO: a cmd line parameter for controlling this bool ;)
- KMimeType::Ptr mime = KMimeType::tqfindByPath( fileName, 0, true );
+ KMimeType::Ptr mime = KMimeType::findByPath( fileName, 0, true );
if ( mime && mime->name() != KMimeType::defaultMimeType() )
printf( "%s\n", mime->name().latin1());
else
diff --git a/kio/tests/kmimemagictest.cpp b/kio/tests/kmimemagictest.cpp
index d6b500d1f..eb01137c9 100644
--- a/kio/tests/kmimemagictest.cpp
+++ b/kio/tests/kmimemagictest.cpp
@@ -34,14 +34,14 @@ int main( int argc, char** argv )
TQString file = TQString::fromLocal8Bit( argv[1] );
- KMimeMagicResult * result = KMimeMagic::self()->tqfindFileType( file );
+ KMimeMagicResult * result = KMimeMagic::self()->findFileType( file );
if ( result->isValid() )
printf( "Found %s, accuracy %d\n", result->mimeType().latin1(), result->accuracy() );
else
printf( "Invalid result\n");
- KMimeType::Format f = KMimeType::tqfindFormatByFileContent( file );
+ KMimeType::Format f = KMimeType::findFormatByFileContent( file );
if (f.text)
printf("Text\n");
else
diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp
index 65e60f99b..b0fe392f2 100644
--- a/kio/tests/kprotocolinfotest.cpp
+++ b/kio/tests/kprotocolinfotest.cpp
@@ -53,7 +53,7 @@ int main(int argc, char **argv) {
TQStringList capabilities = KProtocolInfo::capabilities( "imap" );
kdDebug() << "kio_imap capabilities: " << capabilities << endl;
- //assert(capabilities.tqcontains("ACL"));
+ //assert(capabilities.contains("ACL"));
return 0;
}
diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/ksycocatest.cpp
index a9fa8198a..4a4fcabb0 100644
--- a/kio/tests/ksycocatest.cpp
+++ b/kio/tests/ksycocatest.cpp
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
KApplication k(argc,argv,"whatever",false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption
TQCString instname = "kword";
- TQString desktopPath = TQString::tqfromLatin1( "Office/%1.desktop" ).arg( instname );
+ TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname );
qDebug( "Looking for %s", desktopPath.latin1() );
KService::Ptr service = KService::serviceByDesktopPath( desktopPath );
if ( service )
diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp
index 667e6014d..8e4b023cb 100644
--- a/kio/tests/kurifiltertest.cpp
+++ b/kio/tests/kurifiltertest.cpp
@@ -45,7 +45,7 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType
if( abs_path )
{
- m_filterData->setAbsolutePath( TQString::tqfromLatin1( abs_path ) );
+ m_filterData->setAbsolutePath( TQString::fromLatin1( abs_path ) );
kdDebug() << "Filtering: " << a << " with abs_path=" << abs_path << endl;
}
else
@@ -97,8 +97,8 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType
if ( expectedResult )
{
// Hack for other locales than english, normalize google hosts to google.com
- cmd = cmd.tqreplace( TQRegExp( "www\\.google\\.[^/]*/" ), "www.google.com/" );
- if ( cmd != TQString::tqfromLatin1( expectedResult ) )
+ cmd = cmd.replace( TQRegExp( "www\\.google\\.[^/]*/" ), "www.google.com/" );
+ if ( cmd != TQString::fromLatin1( expectedResult ) )
{
kdError() << " Got " << cmd << " expected " << expectedResult << endl;
::exit(1);
diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp
index f5113f05b..612dab558 100644
--- a/kio/tests/kurlcompletiontest.cpp
+++ b/kio/tests/kurlcompletiontest.cpp
@@ -96,9 +96,9 @@ void KURLCompletionTest::testLocalRelativePath()
waitForCompletion();
TQStringList comp1all = m_completion->allMatches();
assert( comp1all.count() == 2 );
- assert( comp1all.tqfind( "file1" ) != comp1all.end() );
- assert( comp1all.tqfind( "file#a" ) != comp1all.end() );
- TQString comp1 = m_completion->tqreplacedPath( "file1" ); // like KURLRequester does
+ assert( comp1all.find( "file1" ) != comp1all.end() );
+ assert( comp1all.find( "file#a" ) != comp1all.end() );
+ TQString comp1 = m_completion->replacedPath( "file1" ); // like KURLRequester does
assert( comp1 == "file1" );
// Completion from relative path
@@ -109,7 +109,7 @@ void KURLCompletionTest::testLocalRelativePath()
kdDebug() << compall << endl;
assert( compall.count() == 1 );
assert( compall.first() == "file#a" );
- TQString comp2 = m_completion->tqreplacedPath( compall.first() ); // like KURLRequester does
+ TQString comp2 = m_completion->replacedPath( compall.first() ); // like KURLRequester does
assert( comp2 == "file#a" );
}
@@ -124,7 +124,7 @@ void KURLCompletionTest::testLocalAbsolutePath()
assert( compall.count() == 1 );
TQString comp = compall.first();
assert( comp == m_dir + "file#a" );
- comp = m_completion->tqreplacedPath( comp ); // like KURLRequester does
+ comp = m_completion->replacedPath( comp ); // like KURLRequester does
assert( comp == m_dir + "file#a" );
}
@@ -138,10 +138,10 @@ void KURLCompletionTest::testLocalURL()
TQStringList comp1all = m_completion->allMatches();
kdDebug() << comp1all << endl;
assert( comp1all.count() == 2 );
- assert( comp1all.tqfind( m_dirURL.url() + "file1" ) != comp1all.end() );
+ assert( comp1all.find( m_dirURL.url() + "file1" ) != comp1all.end() );
TQString filehash = m_dirURL.url() + "file%23a";
- assert( comp1all.tqfind( filehash ) != comp1all.end() );
- TQString filehashPath = m_completion->tqreplacedPath( filehash ); // note that it returns a path!!
+ assert( comp1all.find( filehash ) != comp1all.end() );
+ TQString filehashPath = m_completion->replacedPath( filehash ); // note that it returns a path!!
kdDebug() << filehashPath << endl;
assert( filehashPath == m_dirURL.path() + "file#a" );
diff --git a/kio/tests/previewtest.cpp b/kio/tests/previewtest.cpp
index f64cb75f9..f2b740224 100644
--- a/kio/tests/previewtest.cpp
+++ b/kio/tests/previewtest.cpp
@@ -14,16 +14,16 @@
PreviewTest::PreviewTest()
:TQWidget()
{
- TQGridLayout *tqlayout = new TQGridLayout(this, 2, 2);
+ TQGridLayout *layout = new TQGridLayout(this, 2, 2);
m_url = new KLineEdit(this);
m_url->setText("/home/malte/gore_bush.jpg");
- tqlayout->addWidget(m_url, 0, 0);
+ layout->addWidget(m_url, 0, 0);
TQPushButton *btn = new TQPushButton("Generate", this);
connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate()));
- tqlayout->addWidget(btn, 0, 1);
+ layout->addWidget(btn, 0, 1);
m_preview = new TQLabel(this);
m_preview->setMinimumSize(400, 300);
- tqlayout->addMultiCellWidget(m_preview, 1, 1, 0, 1);
+ layout->addMultiCellWidget(m_preview, 1, 1, 0, 1);
}
void PreviewTest::slotGenerate()
diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp
index 4b29e1815..d8ddae20a 100644
--- a/kio/tests/speed.cpp
+++ b/kio/tests/speed.cpp
@@ -87,7 +87,7 @@ int main(int argc, char **argv) {
} else
kdDebug() << mp << " is the mount point for device " << url.url() << endl;
- mp = KIO::tqfindPathMountPoint(url.path());
+ mp = KIO::findPathMountPoint(url.path());
if (mp.isEmpty()) {
kdDebug() << "no mount point for path " << url.url() << " found\n";
} else
@@ -95,7 +95,7 @@ int main(int argc, char **argv) {
// SpeedTest test( url );
// app.exec();
- mp = KIO::tqfindPathMountPoint(url.path());
+ mp = KIO::findPathMountPoint(url.path());
if (mp.isEmpty()) {
kdDebug() << "no mount point for path " << url.url() << " found\n";
} else
@@ -105,7 +105,7 @@ int main(int argc, char **argv) {
url.setPath(TQDir::homeDirPath());
- mp = KIO::tqfindPathMountPoint(url.path());
+ mp = KIO::findPathMountPoint(url.path());
if (mp.isEmpty()) {
kdDebug() << "no mount point for path " << url.url() << " found\n";
} else
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
// SpeedTest test( url );
// app.exec();
- mp = KIO::tqfindPathMountPoint(url.path());
+ mp = KIO::findPathMountPoint(url.path());
if (mp.isEmpty()) {
kdDebug() << "no mount point for path " << url.url() << " found\n";
} else
@@ -126,7 +126,7 @@ int main(int argc, char **argv) {
else
url = "file:" + TQDir::currentDirPath();
- mp = KIO::tqfindPathMountPoint(url.path());
+ mp = KIO::findPathMountPoint(url.path());
if (mp.isEmpty()) {
kdDebug() << "no mount point for path " << url.url() << " found\n";
} else
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-27 07:58:00 +0000