diff options
Diffstat (limited to 'tdeio/tests')
33 files changed, 142 insertions, 137 deletions
diff --git a/tdeio/tests/CMakeLists.txt b/tdeio/tests/CMakeLists.txt index 323a7d86e..e9f5ea5ff 100644 --- a/tdeio/tests/CMakeLists.txt +++ b/tdeio/tests/CMakeLists.txt @@ -80,6 +80,7 @@ configure_file( kmimetypetest.sh.cmake kmimetypetest.sh @ONLY ) add_test( NAME "tdeio/kmimetypetest" COMMAND sh -x "${CMAKE_CURRENT_BINARY_DIR}/kmimetypetest.sh" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" ) +set_tests_properties( "tdeio/kmimetypetest" PROPERTIES TIMEOUT 30) # TODO add kdirwatchunittest diff --git a/tdeio/tests/dataprotocoltest.cpp b/tdeio/tests/dataprotocoltest.cpp index ed0a63ed9..45e4d1dda 100644 --- a/tdeio/tests/dataprotocoltest.cpp +++ b/tdeio/tests/dataprotocoltest.cpp @@ -247,7 +247,7 @@ const char * const url; #if 0 // == charset tests // -------------------- string -const QChar +const TQChar const TQChar * const charset_urls[] = { #endif diff --git a/tdeio/tests/dummymeta.h b/tdeio/tests/dummymeta.h index 4cefcc01d..20c9fec54 100644 --- a/tdeio/tests/dummymeta.h +++ b/tdeio/tests/dummymeta.h @@ -7,7 +7,7 @@ class KFileMetaInfo; class DummyMeta : public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: DummyMeta( TQObject *parent, const char *name, const TQStringList &args ); diff --git a/tdeio/tests/getalltest.cpp b/tdeio/tests/getalltest.cpp index 96d39c3c2..40a0ec934 100644 --- a/tdeio/tests/getalltest.cpp +++ b/tdeio/tests/getalltest.cpp @@ -7,7 +7,7 @@ int main(int argc, char *argv[]) { - TDEApplication k(argc,argv,"getalltest",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"getalltest",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs TDEApp for makeStdCaption //for (int i = 0 ; i < 2 ; ++i ) { // test twice to see if they got deleted kdDebug() << "All services" << endl; diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp index 7df3ff3f0..8a17b2aec 100644 --- a/tdeio/tests/jobtest.cpp +++ b/tdeio/tests/jobtest.cpp @@ -160,7 +160,7 @@ static void createTestFile( const TQString& path ) TQFile f( path ); if ( !f.open( IO_WriteOnly ) ) kdFatal() << "Can't create " << path << endl; - f.tqwriteBlock( "Hello world", 11 ); + f.writeBlock( "Hello world", 11 ); f.close(); setTimeStamp( path ); } @@ -195,9 +195,9 @@ void JobTest::get() KURL u; u.setPath( filePath ); m_result = -1; TDEIO::StoredTransferJob* job = TDEIO::storedGet( u ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotGetResult( TDEIO::Job* ) ) ); - kapp->eventLoop()->enterLoop(); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotGetResult( TDEIO::Job* ) ) ); + tdeApp->eventLoop()->enterLoop(); assert( m_result == 0 ); // no error assert( m_data.size() == 11 ); assert( memcmp (m_data, "Hello world", m_data.size()) == 0 ); // m_data is not null-terminated @@ -207,7 +207,7 @@ void JobTest::slotGetResult( TDEIO::Job* job ) { m_result = job->error(); m_data = static_cast<TDEIO::StoredTransferJob *>(job)->data(); - kapp->eventLoop()->exitLoop(); + tdeApp->eventLoop()->exitLoop(); } //// @@ -498,8 +498,8 @@ void JobTest::listRecursive() KURL u; u.setPath( src ); TDEIO::ListJob* job = TDEIO::listRecursive( u ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); m_names.sort(); @@ -565,8 +565,8 @@ void JobTest::copyFileToSystem( bool resolve_local_urls ) // copy the file with file_copy TDEIO::FileCopyJob* job = TDEIO::file_copy( u, d ); - connect( job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), - this, TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); + connect( job, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), + this, TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); diff --git a/tdeio/tests/jobtest.h b/tdeio/tests/jobtest.h index 5bff6d0e3..bcf1af5ac 100644 --- a/tdeio/tests/jobtest.h +++ b/tdeio/tests/jobtest.h @@ -26,7 +26,7 @@ class JobTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: JobTest() {} diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp index e99de7e79..0b5692f59 100644 --- a/tdeio/tests/kdcopcheck.cpp +++ b/tdeio/tests/kdcopcheck.cpp @@ -3,11 +3,11 @@ #include <kservice.h> #include <kmimetype.h> #include <assert.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kimageio.h> #include <kprotocolinfo.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqtimer.h> #include "kdcopcheck.h" @@ -40,14 +40,14 @@ TestService::TestService(const TQString &exec) proc.start(); - connect(kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString&)), - this, TQT_SLOT(newApp(const TQCString&))); - connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)), - this, TQT_SLOT(endApp(const TQCString&))); - connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(appExit())); + connect(tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)), + this, TQ_SLOT(newApp(const TQCString&))); + connect(tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)), + this, TQ_SLOT(endApp(const TQCString&))); + connect(&proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(appExit())); - TQTimer::singleShot(20*1000, this, TQT_SLOT(stop())); + TQTimer::singleShot(20*1000, this, TQ_SLOT(stop())); result = KService::DCOP_None; } @@ -79,19 +79,19 @@ void TestService::appExit() void TestService::stop() { - kapp->exit_loop(); + tdeApp->exit_loop(); } int TestService::exec() { - kapp->enter_loop(); + tdeApp->enter_loop(); return result; } int main(int argc, char *argv[]) { setenv("IGNORE_SYCOCA_VERSION", "true", true); - TDEApplication k(argc,argv,"whatever",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",false/*nostyle*/,false/*noGUI*/); // KMessageBox needs TDEApp for makeStdCaption k.dcopClient()->setNotifications(true); diff --git a/tdeio/tests/kdcopcheck.h b/tdeio/tests/kdcopcheck.h index 593dbba1e..a5ea1d979 100644 --- a/tdeio/tests/kdcopcheck.h +++ b/tdeio/tests/kdcopcheck.h @@ -1,13 +1,13 @@ #ifndef _BLA_H_ #define _BLA_H_ -#include <kprocess.h> +#include <tdeprocess.h> #include <tqstring.h> #include <tqobject.h> class TestService : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestService(const TQString &exec); diff --git a/tdeio/tests/kdefaultprogresstest.cpp b/tdeio/tests/kdefaultprogresstest.cpp index b3f778772..fb4bc2bd3 100644 --- a/tdeio/tests/kdefaultprogresstest.cpp +++ b/tdeio/tests/kdefaultprogresstest.cpp @@ -29,7 +29,7 @@ int main(int argc, char **argv) { dlg->slotProcessedFiles( 0L, ++files ); } - kapp->processEvents(); + tdeApp->processEvents(); } dlg->slotInfoMessage( 0L, TQString::fromLatin1( "Done." ) ); diff --git a/tdeio/tests/kdirlistertest.cpp b/tdeio/tests/kdirlistertest.cpp index b1208f41d..54cefac87 100644 --- a/tdeio/tests/kdirlistertest.cpp +++ b/tdeio/tests/kdirlistertest.cpp @@ -49,48 +49,48 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name ) layout->addWidget( test ); resize( layout->sizeHint() ); - connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) ); - connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) ); - connect( startT, TQT_SIGNAL( clicked() ), TQT_SLOT( startTar() ) ); - connect( test, TQT_SIGNAL( clicked() ), TQT_SLOT( test() ) ); - - connect( lister, TQT_SIGNAL( started( const KURL & ) ), - debug, TQT_SLOT( started( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( completed() ), - debug, TQT_SLOT( completed() ) ); - connect( lister, TQT_SIGNAL( completed( const KURL & ) ), - debug, TQT_SLOT( completed( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( canceled() ), - debug, TQT_SLOT( canceled() ) ); - connect( lister, TQT_SIGNAL( canceled( const KURL & ) ), - debug, TQT_SLOT( canceled( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( redirection( const KURL & ) ), - debug, TQT_SLOT( redirection( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - debug, TQT_SLOT( redirection( const KURL &, const KURL & ) ) ); - connect( lister, TQT_SIGNAL( clear() ), - debug, TQT_SLOT( clear() ) ); - connect( lister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - debug, TQT_SLOT( newItems( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ), - debug, TQT_SLOT( itemsFilteredByMime( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - debug, TQT_SLOT( deleteItem( KFileItem * ) ) ); - connect( lister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - debug, TQT_SLOT( refreshItems( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( infoMessage( const TQString& ) ), - debug, TQT_SLOT( infoMessage( const TQString& ) ) ); - connect( lister, TQT_SIGNAL( percent( int ) ), - debug, TQT_SLOT( percent( int ) ) ); - connect( lister, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - debug, TQT_SLOT( totalSize( TDEIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - debug, TQT_SLOT( processedSize( TDEIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( speed( int ) ), - debug, TQT_SLOT( speed( int ) ) ); - - connect( lister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( completed() ) ); + connect( startR, TQ_SIGNAL( clicked() ), TQ_SLOT( startRoot() ) ); + connect( startH, TQ_SIGNAL( clicked() ), TQ_SLOT( startHome() ) ); + connect( startT, TQ_SIGNAL( clicked() ), TQ_SLOT( startTar() ) ); + connect( test, TQ_SIGNAL( clicked() ), TQ_SLOT( test() ) ); + + connect( lister, TQ_SIGNAL( started( const KURL & ) ), + debug, TQ_SLOT( started( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( completed() ), + debug, TQ_SLOT( completed() ) ); + connect( lister, TQ_SIGNAL( completed( const KURL & ) ), + debug, TQ_SLOT( completed( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( canceled() ), + debug, TQ_SLOT( canceled() ) ); + connect( lister, TQ_SIGNAL( canceled( const KURL & ) ), + debug, TQ_SLOT( canceled( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( redirection( const KURL & ) ), + debug, TQ_SLOT( redirection( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + debug, TQ_SLOT( redirection( const KURL &, const KURL & ) ) ); + connect( lister, TQ_SIGNAL( clear() ), + debug, TQ_SLOT( clear() ) ); + connect( lister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + debug, TQ_SLOT( newItems( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ), + debug, TQ_SLOT( itemsFilteredByMime( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + debug, TQ_SLOT( deleteItem( KFileItem * ) ) ); + connect( lister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + debug, TQ_SLOT( refreshItems( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( infoMessage( const TQString& ) ), + debug, TQ_SLOT( infoMessage( const TQString& ) ) ); + connect( lister, TQ_SIGNAL( percent( int ) ), + debug, TQ_SLOT( percent( int ) ) ); + connect( lister, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + debug, TQ_SLOT( totalSize( TDEIO::filesize_t ) ) ); + connect( lister, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + debug, TQ_SLOT( processedSize( TDEIO::filesize_t ) ) ); + connect( lister, TQ_SIGNAL( speed( int ) ), + debug, TQ_SLOT( speed( int ) ) ); + + connect( lister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( completed() ) ); } KDirListerTest::~KDirListerTest() diff --git a/tdeio/tests/kdirlistertest.h b/tdeio/tests/kdirlistertest.h index 484121eef..550b5c1ce 100644 --- a/tdeio/tests/kdirlistertest.h +++ b/tdeio/tests/kdirlistertest.h @@ -33,7 +33,7 @@ using namespace std; class PrintSignals : public TQObject { - Q_OBJECT + TQ_OBJECT public: PrintSignals() : TQObject() { } @@ -100,7 +100,7 @@ public slots: class KDirListerTest : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KDirListerTest( TQWidget *parent=0, const char *name=0 ); ~KDirListerTest(); diff --git a/tdeio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp index 9f50c2170..eed240f2d 100644 --- a/tdeio/tests/kdirwatchtest.cpp +++ b/tdeio/tests/kdirwatchtest.cpp @@ -38,9 +38,9 @@ int main (int argc, char **argv) KDirWatch *dirwatch1 = KDirWatch::self(); KDirWatch *dirwatch2 = new KDirWatch; - testObject.connect(dirwatch1, TQT_SIGNAL( dirty( const TQString &)), TQT_SLOT( dirty( const TQString &)) ); - testObject.connect(dirwatch1, TQT_SIGNAL( created( const TQString &)), TQT_SLOT( created( const TQString &)) ); - testObject.connect(dirwatch1, TQT_SIGNAL( deleted( const TQString &)), TQT_SLOT( deleted( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( dirty( const TQString &)), TQ_SLOT( dirty( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( created( const TQString &)), TQ_SLOT( created( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( deleted( const TQString &)), TQ_SLOT( deleted( const TQString &)) ); if (args->count() >0) { for(int i = 0; i < args->count(); i++) { diff --git a/tdeio/tests/kdirwatchtest.h b/tdeio/tests/kdirwatchtest.h index 493043c01..ee7974f6f 100644 --- a/tdeio/tests/kdirwatchtest.h +++ b/tdeio/tests/kdirwatchtest.h @@ -21,7 +21,7 @@ class myTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: myTest() { }; public slots: diff --git a/tdeio/tests/kdirwatchunittest.cpp b/tdeio/tests/kdirwatchunittest.cpp index ed59f3c19..773ce476b 100644 --- a/tdeio/tests/kdirwatchunittest.cpp +++ b/tdeio/tests/kdirwatchunittest.cpp @@ -120,9 +120,9 @@ void KDirWatchTest::allTests() TQDir* dir = new TQDir(m_workingDir); VERIFY (dir != 0); - connect(d, TQT_SIGNAL (dirty( const TQString &)), TQT_SLOT( slotDirty( const TQString &)) ); - connect(d, TQT_SIGNAL (created( const TQString &)), TQT_SLOT( slotCreated( const TQString &)) ); - connect(d, TQT_SIGNAL (deleted( const TQString &)), TQT_SLOT( slotDeleted( const TQString &)) ); + connect(d, TQ_SIGNAL (dirty( const TQString &)), TQ_SLOT( slotDirty( const TQString &)) ); + connect(d, TQ_SIGNAL (created( const TQString &)), TQ_SLOT( slotCreated( const TQString &)) ); + connect(d, TQ_SIGNAL (deleted( const TQString &)), TQ_SLOT( slotDeleted( const TQString &)) ); VERIFY (dir->mkdir (m_workingDir)); diff --git a/tdeio/tests/kdirwatchunittest.h b/tdeio/tests/kdirwatchunittest.h index 416aeecfe..99c7f73c3 100644 --- a/tdeio/tests/kdirwatchunittest.h +++ b/tdeio/tests/kdirwatchunittest.h @@ -24,7 +24,7 @@ class KDirWatchTest : public KUnitTest::Tester { - Q_OBJECT + TQ_OBJECT public: enum { sigDirty, sigCreated, sigDeleted }; diff --git a/tdeio/tests/kfiltertest.cpp b/tdeio/tests/kfiltertest.cpp index f16b957ab..5e0fdfba4 100644 --- a/tdeio/tests/kfiltertest.cpp +++ b/tdeio/tests/kfiltertest.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> void test_block( const TQString & fileName ) { @@ -35,7 +35,7 @@ void test_block( const TQString & fileName ) TQByteArray array(1024); int n; - while ( ( n = dev->tqreadBlock( array.data(), array.size() ) ) ) + while ( ( n = dev->readBlock( array.data(), array.size() ) ) ) { kdDebug() << "readBlock returned " << n << endl << endl; // TQCString s(array,n+1); // Terminate with 0 before printing @@ -55,9 +55,9 @@ void test_block_write( const TQString & fileName ) if ( !dev->open( IO_WriteOnly ) ) { kdWarning() << "open failed " << endl; return; } TQCString s("hello\n"); - int ret = dev->tqwriteBlock( s, s.size()-1 ); + int ret = dev->writeBlock( s, s.size()-1 ); kdDebug() << "writeBlock ret=" << ret << endl; - //ret = dev->tqwriteBlock( s, s.size()-1 ); + //ret = dev->writeBlock( s, s.size()-1 ); //kdDebug() << "writeBlock ret=" << ret << endl; dev->close(); delete dev; diff --git a/tdeio/tests/kmfitest.cpp b/tdeio/tests/kmfitest.cpp index a2ec91717..aadde7652 100644 --- a/tdeio/tests/kmfitest.cpp +++ b/tdeio/tests/kmfitest.cpp @@ -1,7 +1,7 @@ #include <stdio.h> #include <tqdir.h> #include <tqfile.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kurl.h> #include <tdefilemetainfo.h> #include <kmimetype.h> diff --git a/tdeio/tests/kmimemagictest.cpp b/tdeio/tests/kmimemagictest.cpp index 00c545c3c..47583ea21 100644 --- a/tdeio/tests/kmimemagictest.cpp +++ b/tdeio/tests/kmimemagictest.cpp @@ -19,7 +19,7 @@ #include <kmimetype.h> #include <kmimemagic.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <stdio.h> int main( int argc, char** argv ) diff --git a/tdeio/tests/kmimetypetest.cpp b/tdeio/tests/kmimetypetest.cpp index 631521c8a..bf41d8c40 100644 --- a/tdeio/tests/kmimetypetest.cpp +++ b/tdeio/tests/kmimetypetest.cpp @@ -17,7 +17,7 @@ */ #include <kmimetype.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <ktempdir.h> #include <kprotocolinfo.h> #include <tqdir.h> diff --git a/tdeio/tests/kmimetypetest.sh.cmake b/tdeio/tests/kmimetypetest.sh.cmake index 3bcd98669..55a0ffbc6 100644 --- a/tdeio/tests/kmimetypetest.sh.cmake +++ b/tdeio/tests/kmimetypetest.sh.cmake @@ -5,11 +5,16 @@ HOME=@CMAKE_CURRENT_BINARY_DIR@/test-home mkdir $HOME $HOME/.trinity $HOME/.trinity/share ln -s @CMAKE_SOURCE_DIR@/mimetypes $HOME/.trinity/share/mimelnk export HOME +export ICEAUTHORITY=$HOME/.ICEauthority # run dcop server ../../dcop/dcopserver --nofork & DCOP_SERVER_PID=$! +while ! ../../dcop/dcopserver --serverid 2>/dev/null; do + sleep 2 +done + # update tdesycoca using mime types from source ../../kded/tdebuildsycoca --noincremental --nosignal diff --git a/tdeio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp index 7562b488a..8f4b6d075 100644 --- a/tdeio/tests/kruntest.cpp +++ b/tdeio/tests/kruntest.cpp @@ -56,9 +56,9 @@ Receiver::Receiver() start = new TQPushButton( "Launch KRuns", this ); stop = new TQPushButton( "Stop those KRuns", this ); stop->setEnabled(false); - TQObject::connect( h, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit()) ); - TQObject::connect( start, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStart()) ); - TQObject::connect( stop, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStop()) ); + TQObject::connect( h, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT(quit()) ); + TQObject::connect( start, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart()) ); + TQObject::connect( stop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStop()) ); adjustSize(); show(); diff --git a/tdeio/tests/kruntest.h b/tdeio/tests/kruntest.h index 68e7a7280..b8870816c 100644 --- a/tdeio/tests/kruntest.h +++ b/tdeio/tests/kruntest.h @@ -25,7 +25,7 @@ class testKRun : public KRun { - Q_OBJECT + TQ_OBJECT public: testKRun( const KURL& _url, mode_t _mode = 0, @@ -42,7 +42,7 @@ public: class TQPushButton; class Receiver : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Receiver(); ~Receiver() {} diff --git a/tdeio/tests/ktartest.cpp b/tdeio/tests/ktartest.cpp index 2c470f6e4..84ada6c06 100644 --- a/tdeio/tests/ktartest.cpp +++ b/tdeio/tests/ktartest.cpp @@ -18,7 +18,7 @@ #include "ktar.h" #include <stdio.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqfile.h> #include <assert.h> diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp index dec955156..708b3b840 100644 --- a/tdeio/tests/kurifiltertest.cpp +++ b/tdeio/tests/kurifiltertest.cpp @@ -26,8 +26,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <tqdir.h> #include <tqregexp.h> @@ -172,7 +172,7 @@ int main(int argc, char **argv) // There is no default search engine by default (since it was annoying when making typos), // so the user has to set it up, which we do here. { - KSimpleConfig cfg( "kuriikwsfilterrc" ); + TDESimpleConfig cfg( "kuriikwsfilterrc" ); cfg.setGroup( "General" ); cfg.writeEntry( "DefaultSearchEngine", "google" ); cfg.writeEntry( "Verbose", true ); @@ -182,7 +182,7 @@ int main(int argc, char **argv) // Enable verbosity for debugging { - KSimpleConfig cfg( "tdeshorturifilterrc" ); + TDESimpleConfig cfg( "tdeshorturifilterrc" ); cfg.writeEntry( "Verbose", true ); cfg.sync(); } @@ -270,7 +270,7 @@ int main(int argc, char **argv) // a search using the default search engine // 'ls' is a bit of a special case though, due to the toplevel domain called 'ls' filter( "cp", "http://www.google.com/search?q=cp&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL, - TQStringList(), 0, false /* don't check for executables, see konq_misc.cc */ ); + TQStringList(), 0, false /* don't check for executables, see konq_misc.cpp */ ); // Executable tests - No IKWS in minicli filter( "cp", "cp", KURIFilterData::EXECUTABLE, minicliFilters ); diff --git a/tdeio/tests/kziptest.cpp b/tdeio/tests/kziptest.cpp index 84d38d134..1e34c98b8 100644 --- a/tdeio/tests/kziptest.cpp +++ b/tdeio/tests/kziptest.cpp @@ -18,7 +18,7 @@ #include "kzip.h" #include <stdio.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tqfile.h> diff --git a/tdeio/tests/previewtest.cpp b/tdeio/tests/previewtest.cpp index 3237f0180..f30e7ad10 100644 --- a/tdeio/tests/previewtest.cpp +++ b/tdeio/tests/previewtest.cpp @@ -19,7 +19,7 @@ PreviewTest::PreviewTest() m_url->setText("/home/malte/gore_bush.jpg"); layout->addWidget(m_url, 0, 0); TQPushButton *btn = new TQPushButton("Generate", this); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate())); layout->addWidget(btn, 0, 1); m_preview = new TQLabel(this); m_preview->setMinimumSize(400, 300); @@ -31,9 +31,9 @@ void PreviewTest::slotGenerate() KURL::List urls; urls.append(m_url->text()); TDEIO::PreviewJob *job = TDEIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQT_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); - connect(job, TQT_SIGNAL(failed(const KFileItem *)), TQT_SLOT(slotFailed())); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQ_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); + connect(job, TQ_SIGNAL(failed(const KFileItem *)), TQ_SLOT(slotFailed())); } void PreviewTest::slotResult(TDEIO::Job*) diff --git a/tdeio/tests/previewtest.h b/tdeio/tests/previewtest.h index 5ef82916d..2a3f5e5d1 100644 --- a/tdeio/tests/previewtest.h +++ b/tdeio/tests/previewtest.h @@ -8,7 +8,7 @@ class KFileItem; class PreviewTest : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PreviewTest(); diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp index 4b14a6bb6..1f2740527 100644 --- a/tdeio/tests/speed.cpp +++ b/tdeio/tests/speed.cpp @@ -32,10 +32,10 @@ SpeedTest::SpeedTest( const KURL & url ) { Job *job = listRecursive( url ); //Job *job = del( KURL("file:" + TQDir::currentDirPath()) ); DANGEROUS ! - connect(job, TQT_SIGNAL( result( TDEIO::Job*)), - TQT_SLOT( finished( TDEIO::Job* ) )); - /*connect(job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(job, TQ_SIGNAL( result( TDEIO::Job*)), + TQ_SLOT( finished( TDEIO::Job* ) )); + /*connect(job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); */ } @@ -54,7 +54,7 @@ void SpeedTest::entries(TDEIO::Job*, const UDSEntryList& list) { void SpeedTest::finished(Job*) { kdDebug() << "job finished" << endl; - kapp->quit(); + tdeApp->quit(); } static TDECmdLineOptions options[] = diff --git a/tdeio/tests/speed.h b/tdeio/tests/speed.h index d7801ae47..1e9dab6a1 100644 --- a/tdeio/tests/speed.h +++ b/tdeio/tests/speed.h @@ -1,4 +1,3 @@ -// -*- c++ -*- #ifndef _SPEED_H #define _SPEED_H @@ -10,7 +9,7 @@ namespace TDEIO { } class SpeedTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: SpeedTest(const KURL & url); diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp index 4d52eab2e..7a44f5313 100644 --- a/tdeio/tests/tdeioslavetest.cpp +++ b/tdeio/tests/tdeioslavetest.cpp @@ -63,7 +63,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) // Operation groupbox & buttons opButtons = new TQButtonGroup( "Operation", main_widget ); topLayout->addWidget( opButtons, 10 ); - connect( opButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeOperation(int)) ); + connect( opButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeOperation(int)) ); TQBoxLayout *hbLayout = new TQHBoxLayout( opButtons, 15 ); @@ -117,7 +117,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) // Progress groupbox & buttons progressButtons = new TQButtonGroup( "Progress dialog mode", main_widget ); topLayout->addWidget( progressButtons, 10 ); - connect( progressButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeProgressMode(int)) ); + connect( progressButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeProgressMode(int)) ); hbLayout = new TQHBoxLayout( progressButtons, 15 ); @@ -145,19 +145,19 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) pbStart = new TQPushButton( "&Start", main_widget ); pbStart->setFixedSize( pbStart->sizeHint() ); - connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) ); + connect( pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(startJob()) ); hbLayout->addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); pbStop->setFixedSize( pbStop->sizeHint() ); pbStop->setEnabled( false ); - connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) ); + connect( pbStop, TQ_SIGNAL(clicked()), TQ_SLOT(stopJob()) ); hbLayout->addWidget( pbStop, 5 ); // close button close = new TQPushButton( "&Close", main_widget ); close->setFixedSize( close->sizeHint() ); - connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit())); + connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotQuit())); topLayout->addWidget( close, 5 ); @@ -166,10 +166,10 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) slave = 0; // slave = TDEIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org")); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave*)), - this, TQT_SLOT(slotSlaveConnected())); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), - this, TQT_SLOT(slotSlaveError())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveConnected(TDEIO::Slave*)), + this, TQ_SLOT(slotSlaveConnected())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), + this, TQ_SLOT(slotSlaveError())); } @@ -184,7 +184,7 @@ void KioslaveTest::slotQuit(){ } if (slave) TDEIO::Scheduler::disconnectSlave(slave); - kapp->quit(); + tdeApp->quit(); } @@ -242,14 +242,14 @@ void KioslaveTest::startJob() { switch ( selectedOperation ) { case List: myJob = TDEIO::listDir( src ); - connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case ListRecursive: myJob = TDEIO::listRecursive( src ); - connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case Stat: @@ -258,15 +258,15 @@ void KioslaveTest::startJob() { case Get: myJob = TDEIO::get( src, true ); - connect(myJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect(myJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); break; case Put: putBuffer = 0; myJob = TDEIO::put( src, -1, true, false); - connect(myJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), - TQT_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); + connect(myJob, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), + TQ_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); break; case Copy: @@ -300,11 +300,11 @@ void KioslaveTest::startJob() { job = myJob; } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( canceled( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( canceled( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if (progressMode == ProgressStatus) { statusProgress->setJob( job ); diff --git a/tdeio/tests/tdeioslavetest.h b/tdeio/tests/tdeioslavetest.h index 7f11bd4e3..efe089fd9 100644 --- a/tdeio/tests/tdeioslavetest.h +++ b/tdeio/tests/tdeioslavetest.h @@ -27,7 +27,7 @@ #include "tdeio/slave.h" class KioslaveTest : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: KioslaveTest( TQString src, TQString dest, uint op, uint pr ); diff --git a/tdeio/tests/tdesycocatest.cpp b/tdeio/tests/tdesycocatest.cpp index f21402405..035c4593f 100644 --- a/tdeio/tests/tdesycocatest.cpp +++ b/tdeio/tests/tdesycocatest.cpp @@ -22,7 +22,7 @@ #include <kservice.h> #include <kmimetype.h> #include <assert.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kservicegroup.h> #include <kimageio.h> #include <kprotocolinfo.h> @@ -67,7 +67,7 @@ void debug(const char *format, const char *txt) int main(int argc, char *argv[]) { - TDEApplication k(argc,argv,"whatever",true); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",true); // KMessageBox needs TDEApp for makeStdCaption TQCString instname = "kword"; TQString desktopPath = TQString::fromLatin1( "Office/%1.desktop" ).arg( instname ); diff --git a/tdeio/tests/tdesycocaupdatetest.cpp b/tdeio/tests/tdesycocaupdatetest.cpp index 5b390efa6..9b0f686b5 100644 --- a/tdeio/tests/tdesycocaupdatetest.cpp +++ b/tdeio/tests/tdesycocaupdatetest.cpp @@ -4,7 +4,7 @@ int main(int argc, char *argv[]) { - TDEApplication k(argc,argv,"whatever",true,true); // KMessageBox needs KApp for makeStdCaption + TDEApplication k(argc,argv,"whatever",true,true); // KMessageBox needs TDEApp for makeStdCaption KService::rebuildKSycoca(0); return 0; |