diff options
Diffstat (limited to 'kio/tests')
-rw-r--r-- | kio/tests/jobtest.cpp | 2 | ||||
-rw-r--r-- | kio/tests/kacltest.cpp | 30 | ||||
-rw-r--r-- | kio/tests/kdefaultprogresstest.cpp | 4 | ||||
-rw-r--r-- | kio/tests/kdirlistertest.cpp | 2 | ||||
-rw-r--r-- | kio/tests/kfiltertest.cpp | 6 | ||||
-rw-r--r-- | kio/tests/kioslavetest.cpp | 2 | ||||
-rw-r--r-- | kio/tests/kruntest.cpp | 2 | ||||
-rw-r--r-- | kio/tests/ksycocatest.cpp | 2 | ||||
-rw-r--r-- | kio/tests/kurifiltertest.cpp | 4 | ||||
-rw-r--r-- | kio/tests/previewtest.cpp | 2 |
10 files changed, 28 insertions, 28 deletions
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index c5dfba9d2..3b7a6c6d3 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::fromLatin1( "system" ) ) ) { + if ( !KProtocolInfo::isKnownProtocol( TQString::tqfromLatin1( "system" ) ) ) { kdDebug() << k_funcinfo << "no kio_system, skipping test" << endl; return; } diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp index e97f7c110..348d35e34 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::fromLatin1("staff"); -static const TQString s_group2 = TQString::fromLatin1("guest"); +static const TQString s_group1 = TQString::tqfromLatin1("staff"); +static const TQString s_group2 = TQString::tqfromLatin1("guest"); #else -static const TQString s_group1 = TQString::fromLatin1("audio"); -static const TQString s_group2 = TQString::fromLatin1("users"); +static const TQString s_group1 = TQString::tqfromLatin1("audio"); +static const TQString s_group2 = TQString::tqfromLatin1("users"); #endif -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" ); +static const TQString s_testACL = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\nmask::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( "mask::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( "mask::r-x\nother::r--\n" ); KACLTest::KACLTest() :m_acl( s_testACL ) @@ -265,8 +265,8 @@ void KACLTest::testSettingExtended() // groups, all and named - 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" ); + const TQString expected2 = TQString::tqfromLatin1( "user::rw-\nuser:bin:rwx\ngroup::rw-\ngroup:" ) + s_group1 + + TQString::tqfromLatin1( ":-wx\ngroup:" ) + s_group2 + TQString::tqfromLatin1(":r--\nmask::rwx\nother::r--\n" ); CharlesII.setACL( s_testACL ); // reset ACLGroupPermissionsList groups; ACLGroupPermissions group = qMakePair( s_group1, ( unsigned short )3 ); diff --git a/kio/tests/kdefaultprogresstest.cpp b/kio/tests/kdefaultprogresstest.cpp index a831041e1..c2a642c1f 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::fromLatin1( "Starting..." ) ); + dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "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::fromLatin1( "Done." ) ); + dlg->slotInfoMessage( 0L, TQString::tqfromLatin1( "Done." ) ); delete dlg; return 0; diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp index 5e12b469b..6137f5e71 100644 --- a/kio/tests/kdirlistertest.cpp +++ b/kio/tests/kdirlistertest.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <kapplication.h> diff --git a/kio/tests/kfiltertest.cpp b/kio/tests/kfiltertest.cpp index fe57deb17..54599e838 100644 --- a/kio/tests/kfiltertest.cpp +++ b/kio/tests/kfiltertest.cpp @@ -21,7 +21,7 @@ #include <unistd.h> #include <limits.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kdebug.h> #include <kinstance.h> @@ -41,8 +41,8 @@ void test_block( const TQString & fileName ) // TQCString s(array,n+1); // Terminate with 0 before printing // printf("%s", s.data()); - kdDebug() << "dev.at = " << dev->at() << endl; - //kdDebug() << "f.at = " << f.at() << endl; + kdDebug() << "dev.at = " << dev->tqat() << endl; + //kdDebug() << "f.at = " << f.tqat() << endl; } dev->close(); delete dev; diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp index 98083a477..0db23457d 100644 --- a/kio/tests/kioslavetest.cpp +++ b/kio/tests/kioslavetest.cpp @@ -9,7 +9,7 @@ LGPL version 2. */ -#include <layout.h> +#include <tqlayout.h> #include <tqmessagebox.h> #include <tqdir.h> diff --git a/kio/tests/kruntest.cpp b/kio/tests/kruntest.cpp index 89f701ffd..0febcbc26 100644 --- a/kio/tests/kruntest.cpp +++ b/kio/tests/kruntest.cpp @@ -28,7 +28,7 @@ #include <kde_file.h> #include <tqpushbutton.h> -#include <layout.h> +#include <tqlayout.h> #include <tqdir.h> #include <stdlib.h> diff --git a/kio/tests/ksycocatest.cpp b/kio/tests/ksycocatest.cpp index 436ae7639..ab0130860 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::fromLatin1( "Office/%1.desktop" ).arg( instname ); + TQString desktopPath = TQString::tqfromLatin1( "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 c448cca90..dd4d84e7f 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::fromLatin1( abs_path ) ); + m_filterData->setAbsolutePath( TQString::tqfromLatin1( abs_path ) ); kdDebug() << "Filtering: " << a << " with abs_path=" << abs_path << endl; } else @@ -98,7 +98,7 @@ void filter( const char* u, const char * expectedResult = 0, int expectedUriType { // Hack for other locales than english, normalize google hosts to google.com cmd = cmd.replace( TQRegExp( "www\\.google\\.[^/]*/" ), "www.google.com/" ); - if ( cmd != TQString::fromLatin1( expectedResult ) ) + if ( cmd != TQString::tqfromLatin1( expectedResult ) ) { kdError() << " Got " << cmd << " expected " << expectedResult << endl; ::exit(1); diff --git a/kio/tests/previewtest.cpp b/kio/tests/previewtest.cpp index 4dbb398f6..f2b740224 100644 --- a/kio/tests/previewtest.cpp +++ b/kio/tests/previewtest.cpp @@ -1,6 +1,6 @@ #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqpushbutton.h> #include <kapplication.h> |