diff options
Diffstat (limited to 'ark')
46 files changed, 510 insertions, 714 deletions
diff --git a/ark/CMakeL10n.txt b/ark/CMakeL10n.txt index 998367b..33c9320 100644 --- a/ark/CMakeL10n.txt +++ b/ark/CMakeL10n.txt @@ -1,3 +1,9 @@ ##### create translation templates ############## tde_l10n_create_template( "ark" ) + +tde_l10n_create_template( + CATALOG "desktop_files/ark-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt index 611b5b7..e275373 100644 --- a/ark/CMakeLists.txt +++ b/ark/CMakeLists.txt @@ -67,15 +67,17 @@ install( FILES arkui.rc ark_part.rc DESTINATION ${DATA_INSTALL_DIR}/ark ) -install( FILES ark.desktop - DESTINATION ${XDG_APPS_INSTALL_DIR} +tde_create_translated_desktop( + SOURCE ark.desktop + PO_DIR ark-desktops ) -install( FILES ark_part.desktop +tde_create_translated_desktop( + SOURCE ark_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR ark-desktops ) install( FILES ark.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) - diff --git a/ark/ChangeLog b/ark/ChangeLog index aa440bd..e9f3e96 100644 --- a/ark/ChangeLog +++ b/ark/ChangeLog @@ -1,8 +1,5 @@ $Id$ -2001-10-24: Roberto Selbach Teixeira <maragato@kde.org> - * Renamed all .cc files to .cpp to make things more logic. - 2001-06-23: Roberto Selbach Teixeira <maragato@kde.org> * Fixed a bug in tar addition with non-compressed tar archives @@ -20,12 +17,12 @@ 2001-05-29 Roberto Selbach Teixeira <maragato@conectiva.com> - * compressedfile.cc (unarchFile): move to fromLocal8Bit() to allow + * compressedfile.cpp (unarchFile): move to fromLocal8Bit() to allow non-Latin1 characters in filenames. - * ar.cc (unarchFile): .latin1() to .local8Bit() + * ar.cpp (unarchFile): .latin1() to .local8Bit() - * zip.cc (unarchFile): .latin1() to .local8Bit() + * zip.cpp (unarchFile): .latin1() to .local8Bit() 2000-07-10: Emily Ezust <emilye@corel.com> * Added checks for available disk space diff --git a/ark/ace.cpp b/ark/ace.cpp index 4f1d2e4..b2ffe8d 100644 --- a/ark/ace.cpp +++ b/ark/ace.cpp @@ -89,15 +89,15 @@ void AceArch::open() kdDebug() << "AceArch::open(): kp->args(): " << kp->args() << endl; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - this, TQT_SLOT( catchMeIfYouCan(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + this, TQ_SLOT( catchMeIfYouCan(TDEProcess*, char*, int) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -158,12 +158,12 @@ void AceArch::unarchFileInternal( ) } } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -31,7 +31,7 @@ class TDEProcess; // TODO: Remove me! class AceArch : public Arch { - Q_OBJECT + TQ_OBJECT public: AceArch( ArkWidget *, const TQString & ); @@ -89,13 +89,13 @@ void ArArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "vt" << m_filename; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedTOC(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedTOC(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotOpenExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotOpenExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -111,10 +111,10 @@ void ArArch::create() kp->clearArguments(); *kp << m_archiver_program << "c" << m_filename; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); if (kp->start(TDEProcess::Block) == false) { @@ -152,13 +152,13 @@ void ArArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -209,13 +209,13 @@ void ArArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotExtractExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotExtractExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -242,13 +242,13 @@ void ArArch::remove(TQStringList *list) *kp << str; } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotDeleteExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotDeleteExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -1,4 +1,3 @@ -// -*-C++-*- emacs magic for .h files /* $Id$ @@ -39,7 +38,7 @@ class ArkWidget; class ArArch : public Arch { - Q_OBJECT + TQ_OBJECT public: ArArch( ArkWidget *_gui, @@ -75,7 +75,7 @@ typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList; */ class Arch : public TQObject { - Q_OBJECT + TQ_OBJECT protected: @@ -211,18 +211,18 @@ class Arch : public TQObject // Columns // don't forget to change common_texts.cpp if you change something here -#define FILENAME_COLUMN tqMakePair( i18n(" Filename "), TQt::AlignLeft ) -#define PERMISSION_COLUMN tqMakePair( i18n(" Permissions "), TQt::AlignLeft ) -#define OWNER_GROUP_COLUMN tqMakePair( i18n(" Owner/Group "), TQt::AlignLeft ) -#define SIZE_COLUMN tqMakePair( i18n(" Size "), TQt::AlignRight ) -#define TIMESTAMP_COLUMN tqMakePair( i18n(" Timestamp "), TQt::AlignRight ) -#define LINK_COLUMN tqMakePair( i18n(" Link "), TQt::AlignLeft ) -#define PACKED_COLUMN tqMakePair( i18n(" Size Now "), TQt::AlignRight ) -#define RATIO_COLUMN tqMakePair( i18n(" Ratio "), TQt::AlignRight ) -#define CRC_COLUMN tqMakePair( i18n("Cyclic Redundancy Check"," CRC "), TQt::AlignLeft ) -#define METHOD_COLUMN tqMakePair( i18n(" Method "), TQt::AlignLeft ) -#define VERSION_COLUMN tqMakePair( i18n(" Version "), TQt::AlignLeft ) -#define OWNER_COLUMN tqMakePair( i18n(" Owner "), TQt::AlignLeft ) -#define GROUP_COLUMN tqMakePair( i18n(" Group "), TQt::AlignLeft ) +#define FILENAME_COLUMN qMakePair( i18n(" Filename "), TQt::AlignLeft ) +#define PERMISSION_COLUMN qMakePair( i18n(" Permissions "), TQt::AlignLeft ) +#define OWNER_GROUP_COLUMN qMakePair( i18n(" Owner/Group "), TQt::AlignLeft ) +#define SIZE_COLUMN qMakePair( i18n(" Size "), TQt::AlignRight ) +#define TIMESTAMP_COLUMN qMakePair( i18n(" Timestamp "), TQt::AlignRight ) +#define LINK_COLUMN qMakePair( i18n(" Link "), TQt::AlignLeft ) +#define PACKED_COLUMN qMakePair( i18n(" Size Now "), TQt::AlignRight ) +#define RATIO_COLUMN qMakePair( i18n(" Ratio "), TQt::AlignRight ) +#define CRC_COLUMN qMakePair( i18n("Cyclic Redundancy Check"," CRC "), TQt::AlignLeft ) +#define METHOD_COLUMN qMakePair( i18n(" Method "), TQt::AlignLeft ) +#define VERSION_COLUMN qMakePair( i18n(" Version "), TQt::AlignLeft ) +#define OWNER_COLUMN qMakePair( i18n(" Owner "), TQt::AlignLeft ) +#define GROUP_COLUMN qMakePair( i18n(" Group "), TQt::AlignLeft ) #endif /* ARCH_H */ diff --git a/ark/archiveformatdlg.h b/ark/archiveformatdlg.h index 136236f..733358a 100644 --- a/ark/archiveformatdlg.h +++ b/ark/archiveformatdlg.h @@ -27,7 +27,7 @@ class ArchiveFormatDlg: public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ArchiveFormatDlg( TQWidget * parent, const TQString & defaultType ); diff --git a/ark/arj.cpp b/ark/arj.cpp index 7022b24..6da0041 100644 --- a/ark/arj.cpp +++ b/ark/arj.cpp @@ -122,12 +122,12 @@ void ArjArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -190,12 +190,12 @@ void ArjArch::open() *kp << m_unarchiver_program << "v" << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -246,12 +246,12 @@ void ArjArch::unarchFileInternal() } } - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -282,12 +282,12 @@ void ArjArch::remove( TQStringList *list ) *kp << str; } - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -310,12 +310,12 @@ void ArjArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -38,7 +38,7 @@ class ArkWidget; class ArjArch : public Arch { - Q_OBJECT + TQ_OBJECT public: ArjArch( ArkWidget *_gui, const TQString & _fileName ); virtual ~ArjArch() { } diff --git a/ark/ark.desktop b/ark/ark.desktop index f78681b..b0770ab 100644 --- a/ark/ark.desktop +++ b/ark/ark.desktop @@ -1,79 +1,7 @@ [Desktop Entry] MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-txz;application/x-lzip;application/x-tlz;application/x-tlzma GenericName=Archiving Tool -GenericName[af]=Argiveer Program -GenericName[ar]=أداة أرشفة -GenericName[bg]=Работа с архиви -GenericName[br]=Ostilh merañ an Dielloù -GenericName[bs]=Alat za arhiviranje -GenericName[ca]=Eina d'arxivament -GenericName[cs]=Archivační nástroj -GenericName[cy]=Erfyn Archifo -GenericName[da]=Arkiveringsværktøj -GenericName[de]=Archivprogramm -GenericName[el]=Εργαλείο αρχειοθέτησης -GenericName[eo]=Arĥivilo -GenericName[es]=Archivador -GenericName[et]=Arhiivide haldamise rakendus -GenericName[eu]=Artxibaketa Tresna -GenericName[fa]=ابزار بایگانی -GenericName[fi]=Pakettienhallintatyökalu -GenericName[fr]=Outil de manipulation d'archives -GenericName[ga]=Uirlis Chartlannaithe -GenericName[he]=כלי לניהול ארכיונים -GenericName[hi]=अभिलेख औज़ार -GenericName[hr]=Uslužni program za arhiviranje -GenericName[hu]=Fájltömörítő -GenericName[is]=Vinna með safnskrár -GenericName[it]=Strumento di archiviazione -GenericName[ja]=アーカイバツール -GenericName[ka]=არქივებთან სამუშაო უტილიტა -GenericName[kk]=Архивтеу құралы -GenericName[km]=ឧបករណ៍ប័ណ្ណសារ -GenericName[lt]=Archyvavimo priemonė -GenericName[lv]=Arhivēšanas Rīks -GenericName[mk]=Алатка за архивирање -GenericName[ms]=Alatan Pengarkiban -GenericName[mt]=Għodda tal-arkivji -GenericName[nb]=Arkiveringsverktøy -GenericName[nds]=Archivwarktüüch -GenericName[ne]=उपकरण सङ्ग्रह गर्दै -GenericName[nl]=Archiefgereedschap -GenericName[nn]=Arkiveringsverktøy -GenericName[pa]=ਪੁਰਾਲੇਖ ਸੰਦ -GenericName[pl]=Narzędzie do archiwizacji -GenericName[pt]=Ferramenta de Armazenamento -GenericName[pt_BR]=Ferramenta de Arquivamento -GenericName[ro]=Utilitar de arhivare -GenericName[ru]=Архиватор -GenericName[sk]=Archivačný nástroj -GenericName[sl]=Orodje za ravnanje z arhivi -GenericName[sr]=Алат за архивирање -GenericName[sr@Latn]=Alat za arhiviranje -GenericName[sv]=Arkiveringsverktyg -GenericName[ta]=காப்பக கருவி -GenericName[tg]=Асбобҳои Бойгонӣ -GenericName[th]=เครื่องมือจัดการแฟ้มบีบอัด -GenericName[tr]=Arşivleme Aracı -GenericName[uk]=Засіб роботи з архівами -GenericName[uz]=Arxivlash vositasi -GenericName[uz@cyrillic]=Архивлаш воситаси -GenericName[ven]=Tshishumiswa tsha fhethu huno vhulungelwa hone zwithu zwa kale -GenericName[vi]=Công cụ nén -GenericName[wa]=Usteye d' årtchivaedje -GenericName[xh]=Isixhobo Sokuphatha i Archive -GenericName[zh_CN]=文件压缩归档工具 -GenericName[zh_TW]=壓縮工具 -GenericName[zu]=Ithuluzi Lomqulu Name=Ark -Name[ar]=أرك -Name[eo]=Arĥivilo -Name[hi]=आर्क -Name[ne]=आर्क -Name[nso]=Areka -Name[pa]=ਆਕ -Name[ta]=ஆர்க் -Name[th]=อาร์ค Exec=ark -caption "%c" %i %m %U Icon=ark Path= diff --git a/ark/ark_dummy.cpp b/ark/ark_dummy.cpp index efd89d8..717ba3c 100644 --- a/ark/ark_dummy.cpp +++ b/ark/ark_dummy.cpp @@ -1,3 +1,3 @@ #include <kdemacros.h> extern "C" int kdemain(int argc, char* argv[]); -extern "C" KDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); } +extern "C" TDE_EXPORT int tdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); } diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 9a8cd50..e1b1bc7 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -72,12 +72,12 @@ ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject awidget = new ArkWidget( parentWidget, "ArkWidget" ); setWidget(awidget); - connect( awidget, TQT_SIGNAL( fixActions() ), this, TQT_SLOT( fixEnables() ) ); - connect( awidget, TQT_SIGNAL( disableAllActions() ), this, TQT_SLOT( disableActions() ) ); - connect( awidget, TQT_SIGNAL( signalFilePopup( const TQPoint& ) ), this, TQT_SLOT( slotFilePopup( const TQPoint& ) ) ); - connect( awidget, TQT_SIGNAL( setWindowCaption( const TQString & ) ), this, TQT_SIGNAL( setWindowCaption( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( removeRecentURL( const KURL & ) ), this, TQT_SIGNAL( removeRecentURL( const KURL & ) ) ); - connect( awidget, TQT_SIGNAL( addRecentURL( const KURL & ) ), this, TQT_SIGNAL( addRecentURL( const KURL & ) ) ); + connect( awidget, TQ_SIGNAL( fixActions() ), this, TQ_SLOT( fixEnables() ) ); + connect( awidget, TQ_SIGNAL( disableAllActions() ), this, TQ_SLOT( disableActions() ) ); + connect( awidget, TQ_SIGNAL( signalFilePopup( const TQPoint& ) ), this, TQ_SLOT( slotFilePopup( const TQPoint& ) ) ); + connect( awidget, TQ_SIGNAL( setWindowCaption( const TQString & ) ), this, TQ_SIGNAL( setWindowCaption( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( removeRecentURL( const KURL & ) ), this, TQ_SIGNAL( removeRecentURL( const KURL & ) ) ); + connect( awidget, TQ_SIGNAL( addRecentURL( const KURL & ) ), this, TQ_SIGNAL( addRecentURL( const KURL & ) ) ); if( readWrite ) setXMLFile( "ark_part.rc" ); @@ -90,22 +90,22 @@ ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject setupActions(); m_ext = new ArkBrowserExtension( this, "ArkBrowserExtension" ); - connect( awidget, TQT_SIGNAL( openURLRequest( const KURL & ) ), - m_ext, TQT_SLOT( slotOpenURLRequested( const KURL & ) ) ); + connect( awidget, TQ_SIGNAL( openURLRequest( const KURL & ) ), + m_ext, TQ_SLOT( slotOpenURLRequested( const KURL & ) ) ); m_bar = new ArkStatusBarExtension( this ); - connect( awidget, TQT_SIGNAL( setStatusBarText( const TQString & ) ), m_bar, - TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( setStatusBarSelectedFiles( const TQString & ) ), m_bar, - TQT_SLOT( slotSetStatusBarSelectedFiles( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( setBusy( const TQString & ) ), m_bar, - TQT_SLOT( slotSetBusy( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( setReady() ), m_bar, - TQT_SLOT( slotSetReady() ) ); - connect( this, TQT_SIGNAL( started(TDEIO::Job*) ), TQT_SLOT( transferStarted(TDEIO::Job*) ) ); - connect( this, TQT_SIGNAL( completed() ), TQT_SLOT( transferCompleted() ) ); - connect( this, TQT_SIGNAL( canceled(const TQString&) ), - TQT_SLOT( transferCanceled(const TQString&) ) ); + connect( awidget, TQ_SIGNAL( setStatusBarText( const TQString & ) ), m_bar, + TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( setStatusBarSelectedFiles( const TQString & ) ), m_bar, + TQ_SLOT( slotSetStatusBarSelectedFiles( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( setBusy( const TQString & ) ), m_bar, + TQ_SLOT( slotSetBusy( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( setReady() ), m_bar, + TQ_SLOT( slotSetReady() ) ); + connect( this, TQ_SIGNAL( started(TDEIO::Job*) ), TQ_SLOT( transferStarted(TDEIO::Job*) ) ); + connect( this, TQ_SIGNAL( completed() ), TQ_SLOT( transferCompleted() ) ); + connect( this, TQ_SIGNAL( canceled(const TQString&) ), + TQ_SLOT( transferCanceled(const TQString&) ) ); setProgressInfoEnabled( false ); } @@ -116,44 +116,44 @@ ArkPart::~ArkPart() void ArkPart::setupActions() { - addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, TQT_TQOBJECT(awidget), - TQT_SLOT(action_add()), actionCollection(), "addfile"); + addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, awidget, + TQ_SLOT(action_add()), actionCollection(), "addfile"); - addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, TQT_TQOBJECT(awidget), - TQT_SLOT(action_add_dir()), actionCollection(), "adddir"); + addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, awidget, + TQ_SLOT(action_add_dir()), actionCollection(), "adddir"); - extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, TQT_TQOBJECT(awidget), - TQT_SLOT(action_extract()), actionCollection(), "extract"); + extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, awidget, + TQ_SLOT(action_extract()), actionCollection(), "extract"); - deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(awidget), - TQT_SLOT(action_delete()), actionCollection(), "delete"); + deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), awidget, + TQ_SLOT(action_delete()), actionCollection(), "delete"); - viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, TQT_TQOBJECT(awidget), - TQT_SLOT(action_view()), actionCollection(), "view"); + viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, awidget, + TQ_SLOT(action_view()), actionCollection(), "view"); - openWithAction = new TDEAction(i18n("&Open With..."), 0, TQT_TQOBJECT(awidget), - TQT_SLOT(slotOpenWith()), actionCollection(), "open_with"); + openWithAction = new TDEAction(i18n("&Open With..."), 0, awidget, + TQ_SLOT(slotOpenWith()), actionCollection(), "open_with"); - editAction = new TDEAction(i18n("Edit &With..."), 0, TQT_TQOBJECT(awidget), - TQT_SLOT(action_edit()), actionCollection(), "edit"); + editAction = new TDEAction(i18n("Edit &With..."), 0, awidget, + TQ_SLOT(action_edit()), actionCollection(), "edit"); testAction = new TDEAction(i18n("&Test integrity"), 0, awidget, - TQT_SLOT(action_test()), actionCollection(), "test"); + TQ_SLOT(action_test()), actionCollection(), "test"); - selectAllAction = KStdAction::selectAll(TQT_TQOBJECT(awidget->fileList()), TQT_SLOT(selectAll()), actionCollection(), "select_all"); + selectAllAction = KStdAction::selectAll(awidget->fileList(), TQ_SLOT(selectAll()), actionCollection(), "select_all"); - deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all"); + deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, awidget->fileList(),TQ_SLOT(unselectAll()), actionCollection(), "deselect_all"); - invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, TQT_TQOBJECT(awidget->fileList()),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection"); + invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, awidget->fileList(),TQ_SLOT(invertSelection()), actionCollection(), "invert_selection"); - saveAsAction = KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection()); + saveAsAction = KStdAction::saveAs(this, TQ_SLOT(file_save_as()), actionCollection()); - //KStdAction::preferences(awidget, TQT_SLOT(showSettings()), actionCollection()); + //KStdAction::preferences(awidget, TQ_SLOT(showSettings()), actionCollection()); - ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, TQT_TQOBJECT(awidget), - TQT_SLOT( showSettings() ), actionCollection(), "options_configure_ark" ); + ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, awidget, + TQ_SLOT( showSettings() ), actionCollection(), "options_configure_ark" ); showSearchBar = new TDEToggleAction( i18n( "Show Search Bar" ), TDEShortcut(), actionCollection(), "options_show_search_bar" ); @@ -161,7 +161,7 @@ ArkPart::setupActions() showSearchBar->setChecked( ArkSettings::showSearchBar() ); - connect( showSearchBar, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(awidget), TQT_SLOT( slotShowSearchBarToggled( bool ) ) ); + connect( showSearchBar, TQ_SIGNAL( toggled( bool ) ), awidget, TQ_SLOT( slotShowSearchBarToggled( bool ) ) ); initialEnables(); } @@ -332,10 +332,10 @@ void ArkPart::transferStarted( TDEIO::Job *job ) if ( job ) { disableActions(); - connect( job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), - TQT_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); - connect( m_bar->cancelButton(), TQT_SIGNAL( clicked() ), - TQT_SLOT( cancelTransfer() ) ); + connect( job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + TQ_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); + connect( m_bar->cancelButton(), TQ_SIGNAL( clicked() ), + TQ_SLOT( cancelTransfer() ) ); } } @@ -343,8 +343,8 @@ void ArkPart::transferCompleted() { if ( m_job ) { - disconnect( m_job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), - this, TQT_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); + disconnect( m_job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + this, TQ_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); m_job = 0; } @@ -369,8 +369,8 @@ void ArkPart::progressInformation( TDEIO::Job *, unsigned long progress ) void ArkPart::cancelTransfer() { - disconnect( m_bar->cancelButton(), TQT_SIGNAL( clicked() ), - this, TQT_SLOT( cancelTransfer() ) ); + disconnect( m_bar->cancelButton(), TQ_SIGNAL( clicked() ), + this, TQ_SLOT( cancelTransfer() ) ); if ( m_job ) { m_job->kill( false ); @@ -413,7 +413,7 @@ void ArkStatusBarExtension::setupStatusBar() } m_pTimer = new TQTimer( this ); - connect( m_pTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgress() ) ); + connect( m_pTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgress() ) ); m_pStatusLabelTotal = new KSqueezedTextLabel( statusBar(), "StatusLabelTotal" ); m_pStatusLabelTotal->setFrameStyle( TQFrame::NoFrame ); diff --git a/ark/ark_part.desktop b/ark/ark_part.desktop index bcb9c60..5665fa7 100644 --- a/ark/ark_part.desktop +++ b/ark/ark_part.desktop @@ -1,134 +1,7 @@ [Desktop Entry] MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-txz;application/x-lzip;application/x-tlz;application/x-tlzma Comment=Archive Handling Tool -Comment[af]=Argief Handtering Program -Comment[ar]=أداة التعامل مع الملفات المضغوطة -Comment[az]=Arxiv İşləmə Vasitəsi -Comment[bg]=Работа с архиви -Comment[br]=Ostilh merañ an dielloù -Comment[bs]=Uslužni program za arhiviranje -Comment[ca]=Eina per a treballar amb arxius -Comment[cs]=Program pro práci s archívy -Comment[cy]=Erfyn Triniaeth Archif -Comment[da]=Arkivbehandlingsværktøj -Comment[de]=Archiv-Verwaltung -Comment[el]=Εργαλείο χειρισμού αρχειοθηκών -Comment[eo]=Administrilo por arĥivoj -Comment[es]=Herramienta para archivos comprimidos -Comment[et]=Arhiivide haldamise rakendus -Comment[eu]=Artxiboak Kudeatzeko tresna -Comment[fa]=ابزار گرداندن بایگانی -Comment[fi]=Pakettienhallintatyökalu -Comment[fr]=Outil de manipulation d'archives -Comment[ga]=Uirlis Láimhseála Cartlainne -Comment[gl]=Ferramenta de Manexo de Arquivos -Comment[he]=כלי לניהול ארכיונים -Comment[hi]=अभिलेख संभाल औज़ार -Comment[hr]=Uslužni program za arhiviranje -Comment[hu]=Tömörítóprogram -Comment[id]=Program bantu menangani archive -Comment[is]=Vinna með safnskrár -Comment[it]=Gestione degli archivi -Comment[ja]=アーカイバツール -Comment[ka]=არქივებთან სამუშაო ხელსაწყო -Comment[kk]=Архивпен айналысу құралы -Comment[km]=ឧបករណ៍គ្រប់គ្រងប័ណ្ណសារ -Comment[lt]=Archyvo valdymo priemonė -Comment[lv]=Arhīvu Apstrādes Rīks -Comment[mk]=Алатка за справување со архивирани датотеки -Comment[ms]=Alatan Pengendalian Arkib -Comment[mt]=Għodda biex tuża l-arkivji -Comment[nb]=Arkivbehandlingsverktøy -Comment[nds]=En Warktüüch för de Archivpleeg -Comment[ne]=ह्यान्डलिङ उपकरण सङ्ग्रह गर्नुहोस् -Comment[nl]=Hulpprogramma voor het beheer van archieven -Comment[nn]=Verktøy for arkivhandsaming -Comment[pa]=ਪੁਰਾਲੇਖ ਬਣਾਉਣ ਸੰਦ -Comment[pl]=Program obsługi archiwów -Comment[pt]=Programa de gestão de arquivos -Comment[pt_BR]=Gerenciador de arquivos empacotados -Comment[ro]=Utilitar de manipulare arhive -Comment[ru]=Программа работы с архивами -Comment[sk]=Program na prácu s archívmi -Comment[sl]=Orodje za ravnanje z arhivi -Comment[sr]=Алат за руковање архивама -Comment[sr@Latn]=Alat za rukovanje arhivama -Comment[sv]=Verktyg för att hantera filarkiv -Comment[ta]= காப்பகத்தை கையாளும் கருவி -Comment[tg]=Асбобҳои Дасткории Бойгонӣ -Comment[th]=เครื่องมือจัดการแฟ้มบีบอัดทั้งหลาย -Comment[tr]=Arşiv İşleme Aracı -Comment[uk]=Засіб роботи з архівами -Comment[uz]=Arxiv uchun vosita -Comment[uz@cyrillic]=Архив учун восита -Comment[ven]=Tshishumiswa tshau fara tsha fhethu huno vhulungwa zwa kale -Comment[vi]=Công cụ xử lí các file nén -Comment[wa]=Usteye po-z apougnî les årtchives -Comment[xh]=Isixhobo sokuphatha i Archive -Comment[zh_CN]=文件压缩归档处理工具 -Comment[zh_TW]=壓縮檔案處理工具 -Comment[zu]=Ithuluzi Lokuphatha Umqulu Name=Archiver -Name[af]=Argifeerder -Name[ar]=الضاغط -Name[az]=Arxivci -Name[br]=Dieller -Name[bs]=Arhiver -Name[ca]=Arxivador -Name[cs]=Archivátor -Name[cy]=Archifydd -Name[da]=Arkivbehandler -Name[de]=Archivprogramm -Name[el]=Πρόγραμμα αρχειοθέτησης -Name[eo]=Arĥivilo -Name[es]=Archivador -Name[et]=Arhiveerija -Name[eu]=Artxibalaria -Name[fa]=بایگانیکننده -Name[fr]=Archiveur -Name[gl]=Arquivador -Name[he]=מנהל הארכיונים -Name[hi]=अभिलेखक -Name[hr]=Arhiver -Name[hu]=Ark fájltömörítő -Name[is]=Skráasafnari -Name[it]=Utilità di archiviazione -Name[ja]=アーカイバ -Name[ka]=არქივარიუსი -Name[kk]=Архивтегіш -Name[km]=កម្មវិធីប័ណ្ណសារ -Name[lt]=Archyvatorius -Name[lv]=Arhivators -Name[mk]=Архивер -Name[ms]=Pengarkib -Name[nb]=Arkivbehandler -Name[ne]=पुरालेखक -Name[nl]=Archiefgereedschap -Name[nn]=Arkiverar -Name[pa]=ਆਕੀਵਰ -Name[pl]=Ark -Name[pt]=Ark -Name[pt_BR]=Arquivador -Name[ro]=Arhivator -Name[ru]=Архиватор -Name[sk]=Archivátor -Name[sl]=Arhivar -Name[sr]=Архивер -Name[sr@Latn]=Arhiver -Name[sv]=Arkiverare -Name[ta]= காப்பகம் -Name[tg]=Бойгонигар -Name[th]=อาร์ไคว์ฟเออร์ -Name[tr]=Arşivci -Name[uk]=Архіватор -Name[uz]=Arxivlagich -Name[uz@cyrillic]=Архивлагич -Name[ven]=Muvhulungi nwa zwithu zwa kale -Name[vi]=Luư trữ -Name[wa]=Årtchiveu -Name[xh]=Umenzi woshicilelo lukawonke-wonke noxwebhu lweMbali -Name[zh_CN]=压缩存档工具 -Name[zu]=Umqulu Icon=ark Type=Service X-TDE-ServiceTypes=KParts/ReadOnlyPart diff --git a/ark/ark_part.h b/ark/ark_part.h index 49af555..78ca5a4 100644 --- a/ark/ark_part.h +++ b/ark/ark_part.h @@ -45,7 +45,7 @@ namespace TDEIO class ArkBrowserExtension: public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name = 0L ); @@ -55,7 +55,7 @@ public slots: class ArkStatusBarExtension: public KParts::StatusBarExtension { - Q_OBJECT + TQ_OBJECT public: ArkStatusBarExtension( KParts::ReadWritePart * parent ); @@ -87,7 +87,7 @@ private: class ArkPart: public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: ArkPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, diff --git a/ark/arkapp.h b/ark/arkapp.h index 787513d..1d98fa3 100644 --- a/ark/arkapp.h +++ b/ark/arkapp.h @@ -51,7 +51,7 @@ class EqualKey // This class follows the singleton pattern. class ArkApplication : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT public: virtual int newInstance(); diff --git a/ark/arkutils.h b/ark/arkutils.h index c53791f..d0f4955 100644 --- a/ark/arkutils.h +++ b/ark/arkutils.h @@ -1,4 +1,3 @@ -// -*-C++-*- emacs magic for .h files /* $Id$ diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp index 34f9cfd..1c12630 100644 --- a/ark/arkviewer.cpp +++ b/ark/arkviewer.cpp @@ -42,7 +42,7 @@ ArkViewer::ArkViewer( TQWidget * parent, const char * name ) m_widget = new TQVBox( this ); m_widget->layout()->setSpacing( 10 ); - connect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFinished() ) ); + connect( this, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFinished() ) ); setMainWidget( m_widget ); } @@ -86,7 +86,7 @@ bool ArkViewer::view( const KURL& filename ) header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum ); - m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype->name(), TQString(), m_widget, 0, TQT_TQOBJECT(this) ); + m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype->name(), TQString(), m_widget, 0, this ); if ( m_part ) { diff --git a/ark/arkviewer.h b/ark/arkviewer.h index af04c80..88cdbf1 100644 --- a/ark/arkviewer.h +++ b/ark/arkviewer.h @@ -27,7 +27,7 @@ class ArkViewer : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 6a6c091..e3b4549 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -299,7 +299,7 @@ ArkWidget::convertTo( const KURL & u ) busy( i18n( "Saving..." ) ); m_convert_tmpDir = new KTempDir( tmpDir() + "convtmp" ); m_convert_tmpDir->setAutoDelete( true ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( convertSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( convertSlotExtractDone( bool ) ) ); m_convert_saveAsURL = u; arch->unarchFile( 0, m_convert_tmpDir->name() ); } @@ -308,15 +308,15 @@ void ArkWidget::convertSlotExtractDone( bool ) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( convertSlotExtractDone( bool ) ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( convertSlotCreate() ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( convertSlotExtractDone( bool ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( convertSlotCreate() ) ); } void ArkWidget::convertSlotCreate() { file_close(); - connect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( convertSlotCreateDone( bool ) ) ); + connect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( convertSlotCreateDone( bool ) ) ); TQString archToCreate; if ( m_convert_saveAsURL.isLocalFile() ) archToCreate = m_convert_saveAsURL.path(); @@ -330,7 +330,7 @@ ArkWidget::convertSlotCreate() void ArkWidget::convertSlotCreateDone( bool success ) { - disconnect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( convertSlotCreateDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( convertSlotCreateDone( bool ) ) ); kdDebug( 1601 ) << k_funcinfo << endl; if ( !success ) { @@ -357,7 +357,7 @@ ArkWidget::convertSlotCreateDone( bool success ) *it = TQString::fromLatin1( "file:" )+ m_convert_tmpDir->name() + *it; } bool bOldRecVal = ArkSettings::rarRecurseSubdirs(); - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( convertSlotAddDone( bool ) ) ); arch->addFile( entries ); ArkSettings::setRarRecurseSubdirs( bOldRecVal ); } @@ -365,11 +365,11 @@ ArkWidget::convertSlotCreateDone( bool success ) void ArkWidget::convertSlotAddDone( bool success ) { - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( convertSlotAddDone( bool ) ) ); kdDebug( 1601 ) << k_funcinfo << endl; m_convertSuccess = success; // needed ? (TarArch, lzo) - TQTimer::singleShot( 0, this, TQT_SLOT( convertFinish() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( convertFinish() ) ); } void @@ -438,7 +438,7 @@ ArkWidget::extractTo( const KURL & targetDirectory, const KURL & archive, bool b } } - connect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( extractToSlotOpenDone( bool ) ) ); + connect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( extractToSlotOpenDone( bool ) ) ); } const TQString @@ -464,7 +464,7 @@ ArkWidget::guessName( const KURL &archive ) void ArkWidget::extractToSlotOpenDone( bool success ) { - disconnect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( extractToSlotOpenDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( extractToSlotOpenDone( bool ) ) ); if ( !success ) { KMessageBox::error( this, i18n( "An error occurred while opening the archive %1." ).arg( m_url.prettyURL() ) ); @@ -508,7 +508,7 @@ ArkWidget::extractToSlotOpenDone( bool success ) if ( ArkUtils::diskHasSpace( extractDir, m_nSizeOfFiles ) ) { disableAll(); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( extractToSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( extractToSlotExtractDone( bool ) ) ); arch->unarchFile( 0, extractDir ); } else @@ -525,7 +525,7 @@ ArkWidget::extractToSlotOpenDone( bool success ) void ArkWidget::extractToSlotExtractDone( bool success ) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( extractToSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( extractToSlotExtractDone( bool ) ) ); if ( !success ) { kdDebug( 1601 ) << "Last Shell Output" << arch->getLastShellOutput() << endl; @@ -536,7 +536,7 @@ ArkWidget::extractToSlotExtractDone( bool success ) if ( m_extractRemote ) { - connect( this, TQT_SIGNAL( extractRemoteMovingDone() ), this, TQT_SIGNAL( request_file_quit() ) ); + connect( this, TQ_SIGNAL( extractRemoteMovingDone() ), this, TQ_SIGNAL( request_file_quit() ) ); extractRemoteInitiateMoving( m_extractTo_targetDirectory ); } else @@ -565,7 +565,7 @@ ArkWidget::addToArchive( const KURL::List & filesToAdd, const KURL & archive) } } - connect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( addToArchiveSlotCreateDone( bool ) ) ); + connect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( addToArchiveSlotCreateDone( bool ) ) ); // TODO: remote Archives should be handled by createArchive if ( archive.isLocalFile() ) @@ -581,14 +581,14 @@ ArkWidget::addToArchive( const KURL::List & filesToAdd, const KURL & archive) return true; } - connect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( addToArchiveSlotOpenDone( bool ) ) ); + connect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( addToArchiveSlotOpenDone( bool ) ) ); return true; } void ArkWidget::addToArchiveSlotCreateDone( bool success ) { - disconnect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( addToArchiveSlotCreateDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( addToArchiveSlotCreateDone( bool ) ) ); if ( !success ) { kdDebug( 1601 ) << "Could not create the archive" << endl; @@ -602,7 +602,7 @@ void ArkWidget::addToArchiveSlotOpenDone( bool success ) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( addToArchiveSlotOpenDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( addToArchiveSlotOpenDone( bool ) ) ); // TODO: handle dirs with addDir ( or better+easier: get rid of the need to do that entirely ) if ( !success ) { @@ -617,7 +617,7 @@ ArkWidget::addToArchiveSlotOpenDone( bool success ) strFilename = url.path(); if (!strFilename.isEmpty()) { - connect( this, TQT_SIGNAL( createRealArchiveDone( bool ) ), this, TQT_SLOT( addToArchiveSlotAddDone( bool ) ) ); + connect( this, TQ_SIGNAL( createRealArchiveDone( bool ) ), this, TQ_SLOT( addToArchiveSlotAddDone( bool ) ) ); createRealArchive( strFilename, m_addToArchive_filesToAdd.toStringList() ); return; } @@ -662,7 +662,7 @@ ArkWidget::addToArchiveSlotOpenDone( bool success ) kdDebug( 1601 ) << "Adding: " << list << endl; - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( addToArchiveSlotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( addToArchiveSlotAddDone( bool ) ) ); arch->addFile( list.toStringList() ); } @@ -670,7 +670,7 @@ void ArkWidget::addToArchiveSlotAddDone( bool success ) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( this, TQT_SLOT( addToArchiveSlotAddDone( bool ) ) ); + disconnect( this, TQ_SLOT( addToArchiveSlotAddDone( bool ) ) ); if ( !success ) { KMessageBox::error( this, i18n( "An error occurred while adding the files to the archive." ) ); @@ -861,8 +861,8 @@ ArkWidget::extractOnlyOpenDone() void ArkWidget::slotExtractDone(bool success) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( slotExtractDone(bool) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( slotExtractDone(bool) ) ); ready(); if(m_extractList != 0) @@ -919,8 +919,8 @@ ArkWidget::extractRemoteInitiateMoving( const KURL & target ) m_extractURL.adjustPath( 1 ); TDEIO::CopyJob *job = TDEIO::copy( srcList, target, this ); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotExtractRemoteDone(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotExtractRemoteDone(TDEIO::Job*)) ); m_extractRemote = false; } @@ -1010,8 +1010,8 @@ ArkWidget::createRealArchive( const TQString & strFilename, const TQStringList & u2.setPath( m_createRealArchTmpDir->name() + u1.fileName() ); TDEIO::NetAccess::copy( u1, u2, this ); m_compressedFile = "file:" + u2.path(); // AGAIN THE 5 SPACES Hack :-( - connect( newArch, TQT_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), - this, TQT_SLOT( createRealArchiveSlotCreate( Arch *, bool, + connect( newArch, TQ_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), + this, TQ_SLOT( createRealArchiveSlotCreate( Arch *, bool, const TQString &, int ) ) ); file_close(); newArch->create(); @@ -1030,8 +1030,8 @@ ArkWidget::createRealArchiveSlotCreate( Arch * newArch, bool success, listForCompressedFile.append(m_compressedFile); disableAll(); - connect( newArch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddDone( bool ) ) ); + connect( newArch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddDone( bool ) ) ); newArch->addFile(listForCompressedFile); } @@ -1040,8 +1040,8 @@ void ArkWidget::createRealArchiveSlotAddDone( bool success ) { kdDebug( 1601 ) << "createRealArchiveSlotAddDone+, success:" << success << endl; - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddDone( bool ) ) ); m_createRealArchTmpDir->unlink(); delete m_createRealArchTmpDir; @@ -1061,8 +1061,8 @@ ArkWidget::createRealArchiveSlotAddDone( bool success ) } else { - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); // files were dropped in addFile( m_pTempAddList ); } @@ -1072,8 +1072,8 @@ void ArkWidget::createRealArchiveSlotAddFilesDone( bool success ) { //kdDebug( 1601 ) << "createRealArchiveSlotAddFilesDone+, success:" << success << endl; - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); delete m_pTempAddList; m_pTempAddList = NULL; emit createRealArchiveDone( success ); @@ -1150,7 +1150,7 @@ ArkWidget::addFile(TQStringList *list) } - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( slotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( slotAddDone( bool ) ) ); arch->addFile( ( *list ) ); } @@ -1167,7 +1167,7 @@ ArkWidget::action_add_dir() busy( i18n( "Adding folder..." ) ); disableAll(); u = toLocalFile(u); - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( slotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( slotAddDone( bool ) ) ); arch->addDir( u.prettyURL() ); } @@ -1176,7 +1176,7 @@ ArkWidget::action_add_dir() void ArkWidget::slotAddDone(bool _bSuccess) { - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( slotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( slotAddDone( bool ) ) ); m_fileListView->setUpdatesEnabled(true); m_fileListView->triggerUpdate(); ready(); @@ -1280,7 +1280,7 @@ ArkWidget::action_delete() disableAll(); busy( i18n( "Removing..." ) ); - connect( arch, TQT_SIGNAL( sigDelete( bool ) ), this, TQT_SLOT( slotDeleteDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigDelete( bool ) ), this, TQ_SLOT( slotDeleteDone( bool ) ) ); arch->remove(&list); kdDebug(1601) << "-ArkWidget::action_delete" << endl; } @@ -1288,7 +1288,7 @@ ArkWidget::action_delete() void ArkWidget::slotDeleteDone(bool _bSuccess) { - disconnect( arch, TQT_SIGNAL( sigDelete( bool ) ), this, TQT_SLOT( slotDeleteDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigDelete( bool ) ), this, TQ_SLOT( slotDeleteDone( bool ) ) ); kdDebug(1601) << "+ArkWidget::slotDeleteDone" << endl; m_fileListView->setUpdatesEnabled(true); m_fileListView->triggerUpdate(); @@ -1310,8 +1310,8 @@ ArkWidget::slotDeleteDone(bool _bSuccess) void ArkWidget::slotOpenWith() { - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( openWithSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( openWithSlotExtractDone( bool ) ) ); showCurrentFile(); } @@ -1319,8 +1319,8 @@ ArkWidget::slotOpenWith() void ArkWidget::openWithSlotExtractDone( bool success ) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( openWithSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( openWithSlotExtractDone( bool ) ) ); if ( success ) { @@ -1524,7 +1524,7 @@ ArkWidget::action_extract() { disableAll(); busy( i18n( "Extracting..." ) ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( slotExtractDone(bool) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( slotExtractDone(bool) ) ); arch->unarchFile(0, extractDir); } } @@ -1551,8 +1551,8 @@ ArkWidget::action_extract() { disableAll(); busy( i18n( "Extracting..." ) ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( slotExtractDone(bool) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( slotExtractDone(bool) ) ); arch->unarchFile(m_extractList, extractDir); // extract selected files } } @@ -1585,16 +1585,16 @@ ArkWidget::action_edit() // [hmm, does that really make sense? I'll leave it for now.] busy( i18n( "Extracting..." ) ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( editSlotExtractDone() ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( editSlotExtractDone() ) ); showCurrentFile(); } void ArkWidget::editSlotExtractDone() { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( editSlotExtractDone() ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( editSlotExtractDone() ) ); ready(); editStart(); @@ -1619,8 +1619,8 @@ ArkWidget::editStart() TDEProcess *kp = new TDEProcess; *kp << l.text() << m_strFileToView; - connect( kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotEditFinished(TDEProcess *)) ); + connect( kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotEditFinished(TDEProcess *)) ); if ( kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false ) { KMessageBox::error(0, i18n("Trouble editing the file...")); @@ -1632,7 +1632,7 @@ void ArkWidget::slotEditFinished(TDEProcess *kp) { kdDebug(1601) << "+ArkWidget::slotEditFinished" << endl; - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( editSlotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( editSlotAddDone( bool ) ) ); delete kp; TQStringList list; // now put the file back into the archive. @@ -1673,15 +1673,15 @@ void ArkWidget::editSlotAddDone( bool success ) { ready(); - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( editSlotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( editSlotAddDone( bool ) ) ); slotAddDone( success ); } void ArkWidget::action_view() { - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( viewSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( viewSlotExtractDone( bool ) ) ); busy( i18n( "Extracting file to view" ) ); showCurrentFile(); } @@ -1689,8 +1689,8 @@ ArkWidget::action_view() void ArkWidget::action_test() { - connect( arch, TQT_SIGNAL( sigTest( bool ) ), this, - TQT_SLOT( slotTestDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigTest( bool ) ), this, + TQ_SLOT( slotTestDone( bool ) ) ); busy( i18n( "Testing..." ) ); arch->test(); } @@ -1698,8 +1698,8 @@ ArkWidget::action_test() void ArkWidget::slotTestDone(bool ok) { - disconnect( arch, TQT_SIGNAL( sigTest( bool ) ), this, - TQT_SLOT( slotTestDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigTest( bool ) ), this, + TQ_SLOT( slotTestDone( bool ) ) ); ready(); if( ok ) KMessageBox::information(0, i18n("Test successful.")); @@ -1732,8 +1732,8 @@ ArkWidget::viewSlotExtractDone( bool success ) } } - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( viewSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( viewSlotExtractDone( bool ) ) ); delete m_viewList; @@ -1996,15 +1996,15 @@ void ArkWidget::startDrag( const TQStringList & fileList ) { mDragFiles = fileList; - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( startDragSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( startDragSlotExtractDone( bool ) ) ); prepareViewFiles( fileList ); } void ArkWidget::startDragSlotExtractDone( bool ) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( startDragSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( startDragSlotExtractDone( bool ) ) ); KURL::List list; @@ -2036,16 +2036,16 @@ ArkWidget::createFileListView() { m_fileListView = new FileListView(this); - connect( m_fileListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - connect( m_fileListView, TQT_SIGNAL( rightButtonPressed(TQListViewItem *, const TQPoint &, int) ), - this, TQT_SLOT(doPopup(TQListViewItem *, const TQPoint &, int))); - connect( m_fileListView, TQT_SIGNAL( startDragRequest( const TQStringList & ) ), - this, TQT_SLOT( startDrag( const TQStringList & ) ) ); - connect( m_fileListView, TQT_SIGNAL( executed(TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( viewFile(TQListViewItem*) ) ); - connect( m_fileListView, TQT_SIGNAL( returnPressed(TQListViewItem * ) ), - this, TQT_SLOT( viewFile(TQListViewItem*) ) ); + connect( m_fileListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_fileListView, TQ_SIGNAL( rightButtonPressed(TQListViewItem *, const TQPoint &, int) ), + this, TQ_SLOT(doPopup(TQListViewItem *, const TQPoint &, int))); + connect( m_fileListView, TQ_SIGNAL( startDragRequest( const TQStringList & ) ), + this, TQ_SLOT( startDrag( const TQStringList & ) ) ); + connect( m_fileListView, TQ_SIGNAL( executed(TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( viewFile(TQListViewItem*) ) ); + connect( m_fileListView, TQ_SIGNAL( returnPressed(TQListViewItem * ) ), + this, TQ_SLOT( viewFile(TQListViewItem*) ) ); } m_fileListView->clear(); } @@ -2072,8 +2072,8 @@ Arch * ArkWidget::getNewArchive( const TQString & _fileName, const TQString& _mi return NULL; } - connect( newArch, TQT_SIGNAL(headers(const ColumnList&)), - m_fileListView, TQT_SLOT(setHeaders(const ColumnList&))); + connect( newArch, TQ_SIGNAL(headers(const ColumnList&)), + m_fileListView, TQ_SLOT(setHeaders(const ColumnList&))); m_archType = archtype; m_fileListView->setUpdatesEnabled(true); @@ -2093,8 +2093,8 @@ ArkWidget::createArchive( const TQString & _filename ) return false; busy( i18n( "Creating archive..." ) ); - connect( newArch, TQT_SIGNAL(sigCreate(Arch *, bool, const TQString &, int) ), - this, TQT_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); + connect( newArch, TQ_SIGNAL(sigCreate(Arch *, bool, const TQString &, int) ), + this, TQ_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); newArch->create(); return true; @@ -2104,8 +2104,8 @@ void ArkWidget::slotCreate(Arch * _newarch, bool _success, const TQString & _filename, int) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( _newarch, TQT_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), - this, TQT_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); + disconnect( _newarch, TQ_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), + this, TQ_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); ready(); if ( _success ) { @@ -2187,10 +2187,10 @@ ArkWidget::openArchive( const TQString & _filename, const TQString & _password ) m_archType = archtype; - connect( newArch, TQT_SIGNAL(sigOpen(Arch *, bool, const TQString &, int)), - this, TQT_SLOT(slotOpen(Arch *, bool, const TQString &,int)) ); - connect( newArch, TQT_SIGNAL(headers(const ColumnList&)), - m_fileListView, TQT_SLOT(setHeaders(const ColumnList&))); + connect( newArch, TQ_SIGNAL(sigOpen(Arch *, bool, const TQString &, int)), + this, TQ_SLOT(slotOpen(Arch *, bool, const TQString &,int)) ); + connect( newArch, TQ_SIGNAL(headers(const ColumnList&)), + m_fileListView, TQ_SLOT(setHeaders(const ColumnList&))); disableAll(); diff --git a/ark/arkwidget.h b/ark/arkwidget.h index 6d7bd5e..4767ba8 100644 --- a/ark/arkwidget.h +++ b/ark/arkwidget.h @@ -58,7 +58,7 @@ class SearchBar; class ArkWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: ArkWidget( TQWidget *parent=0, const char *name=0 ); diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index a00bc16..d90a700 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -209,12 +209,12 @@ void CompressedFile::open() kdDebug(1601) << "Command is " << m_unarchiver_program << " " << m_tmpfile<< endl; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotUncompressDone(TDEProcess*))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotUncompressDone(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -314,12 +314,12 @@ void CompressedFile::addFile( const TQStringList &urls ) *kp << compressor << "-c" << file; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotAddInProgress(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddDone(TDEProcess*))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotAddInProgress(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddDone(TDEProcess*))); int f_desc = KDE_open(TQFile::encodeName(m_filename), O_CREAT | O_TRUNC | O_WRONLY, 0666); if (f_desc != -1) diff --git a/ark/compressedfile.h b/ark/compressedfile.h index 16d84fb..d3eba30 100644 --- a/ark/compressedfile.h +++ b/ark/compressedfile.h @@ -43,7 +43,7 @@ class ArkWidget; // class CompressedFile : public Arch { - Q_OBJECT + TQ_OBJECT public: CompressedFile( ArkWidget *_gui, const TQString & _fileName, const TQString &_openAsMimeType ); diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp index f4b5196..7d1ba1e 100644 --- a/ark/extractiondialog.cpp +++ b/ark/extractiondialog.cpp @@ -122,9 +122,9 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, m_viewFolderAfterExtraction = new TQCheckBox( i18n( "Open destination folder after extraction" ), vbox ); m_viewFolderAfterExtraction->setChecked( ArkSettings::openDestinationFolder() ); - connect( combobox, TQT_SIGNAL( returnPressed( const TQString& ) ), combobox, TQT_SLOT( addToHistory( const TQString& ) ) ); - connect( combobox->lineEdit(), TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( extractDirChanged( const TQString & ) ) ); + connect( combobox, TQ_SIGNAL( returnPressed( const TQString& ) ), combobox, TQ_SLOT( addToHistory( const TQString& ) ) ); + connect( combobox->lineEdit(), TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( extractDirChanged( const TQString & ) ) ); } ExtractionDialog::~ExtractionDialog() @@ -192,4 +192,3 @@ void ExtractionDialog::extractDirChanged(const TQString &text ) } #include "extractiondialog.moc" -// kate: space-indent off; tab-width 4; diff --git a/ark/extractiondialog.h b/ark/extractiondialog.h index aae9e99..0b5a229 100644 --- a/ark/extractiondialog.h +++ b/ark/extractiondialog.h @@ -40,7 +40,7 @@ class KURLRequester; class ExtractionDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -94,5 +94,3 @@ class ExtractionDialog : public KDialogBase }; #endif // EXTRACTIONDIALOG_H -// kate: space-indent off; tab-width 4; - diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index c1e6f3f..4a0786b 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -162,7 +162,7 @@ void FileLVI::setText( int column, const TQString &text ) TQListViewItem::setText(column, text); else { - m_timeStamp = TQDateTime::fromString( text, Qt::ISODate ); + m_timeStamp = TQDateTime::fromString( text, TQt::ISODate ); TQListViewItem::setText( column, TDEGlobal::locale()->formatDateTime( m_timeStamp ) ); } } @@ -342,7 +342,7 @@ bool FileListView::isSelectionEmpty() void FileListView::contentsMousePressEvent(TQMouseEvent *e) { - if( e->button()==Qt::LeftButton ) + if( e->button()==TQt::LeftButton ) { m_pressed = true; m_presspos = e->pos(); @@ -617,4 +617,3 @@ TQStringList FileListView::childrenOf( FileLVI* parent ) } #include "filelistview.moc" -// kate: space-indent off; tab-width 4; diff --git a/ark/filelistview.h b/ark/filelistview.h index 022ab86..58ecfcb 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -75,7 +75,7 @@ typedef TQValueList< TQPair< TQString, TQt::AlignmentFlags > > ColumnList; class FileListView: public TDEListView { - Q_OBJECT + TQ_OBJECT public: FileListView( TQWidget *parent = 0, const char* name = 0 ); @@ -171,4 +171,3 @@ class FileListView: public TDEListView }; #endif -// kate: space-indent off; tab-width 4; diff --git a/ark/lha.cpp b/ark/lha.cpp index 101277d..08385a6 100644 --- a/ark/lha.cpp +++ b/ark/lha.cpp @@ -146,12 +146,12 @@ void LhaArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "v" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -216,12 +216,12 @@ void LhaArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -257,12 +257,12 @@ void LhaArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -287,12 +287,12 @@ void LhaArch::remove( TQStringList *list ) *kp << ( *it ); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -37,7 +37,7 @@ class ArkWidget; class LhaArch : public Arch { - Q_OBJECT + TQ_OBJECT public: LhaArch( ArkWidget *, const TQString & ); diff --git a/ark/main.cpp b/ark/main.cpp index 48589b6..3ec8593 100644 --- a/ark/main.cpp +++ b/ark/main.cpp @@ -62,7 +62,7 @@ static TDECmdLineOptions option[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] ) +extern "C" TDE_EXPORT int kdemain( int argc, char *argv[] ) { TDEAboutData aboutData( "ark", I18N_NOOP( "Ark" ), "2.6.4", I18N_NOOP( "TDE Archiving tool" ), @@ -124,5 +124,3 @@ extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] ) return ArkApplication::getInstance()->exec(); } - -// kate: space-indent off; tab-width 4; diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 4726989..cada938 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -49,7 +49,7 @@ MainWindow::MainWindow( TQWidget * /*parent*/, const char *name ) : KParts::MainWindow(), progressDialog( 0 ) { setXMLFile( "arkui.rc" ); - m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( "libarkpart", this, name, TQT_TQOBJECT(this), "ArkPart"); + m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( "libarkpart", this, name, this, "ArkPart"); if (m_part ) { //Since most of the functionality is still in ArkWidget: @@ -58,29 +58,29 @@ MainWindow::MainWindow( TQWidget * /*parent*/, const char *name ) setStandardToolBarMenuEnabled( true ); setupActions(); - connect( m_part->widget(), TQT_SIGNAL( request_file_quit() ), this, TQT_SLOT( file_quit() ) ); - connect( KParts::BrowserExtension::childObject( m_part ), TQT_SIGNAL( openURLRequestDelayed + connect( m_part->widget(), TQ_SIGNAL( request_file_quit() ), this, TQ_SLOT( file_quit() ) ); + connect( KParts::BrowserExtension::childObject( m_part ), TQ_SIGNAL( openURLRequestDelayed ( const KURL &, const KParts::URLArgs & ) ), - m_part, TQT_SLOT( openURL( const KURL & ) ) ); + m_part, TQ_SLOT( openURL( const KURL & ) ) ); m_widget->setArchivePopupEnabled( true ); - connect( m_part->widget(), TQT_SIGNAL( signalArchivePopup( const TQPoint & ) ), this, - TQT_SLOT( slotArchivePopup( const TQPoint & ) ) ); - - connect( m_part, TQT_SIGNAL( removeRecentURL( const KURL & ) ), this, - TQT_SLOT( slotRemoveRecentURL( const KURL & ) ) ); - connect( m_part, TQT_SIGNAL( addRecentURL( const KURL & ) ), this, - TQT_SLOT( slotAddRecentURL( const KURL & ) ) ); - connect( m_part, TQT_SIGNAL( fixActionState( const bool & ) ), this, - TQT_SLOT( slotFixActionState( const bool & ) ) ); - connect( m_widget, TQT_SIGNAL( disableAllActions() ), this, - TQT_SLOT( slotDisableActions() ) ); + connect( m_part->widget(), TQ_SIGNAL( signalArchivePopup( const TQPoint & ) ), this, + TQ_SLOT( slotArchivePopup( const TQPoint & ) ) ); + + connect( m_part, TQ_SIGNAL( removeRecentURL( const KURL & ) ), this, + TQ_SLOT( slotRemoveRecentURL( const KURL & ) ) ); + connect( m_part, TQ_SIGNAL( addRecentURL( const KURL & ) ), this, + TQ_SLOT( slotAddRecentURL( const KURL & ) ) ); + connect( m_part, TQ_SIGNAL( fixActionState( const bool & ) ), this, + TQ_SLOT( slotFixActionState( const bool & ) ) ); + connect( m_widget, TQ_SIGNAL( disableAllActions() ), this, + TQ_SLOT( slotDisableActions() ) ); ArkApplication::getInstance()->addWindow(); - connect( m_widget, TQT_SIGNAL( removeOpenArk( const KURL &) ), this, - TQT_SLOT( slotRemoveOpenArk( const KURL & ) ) ); - connect( m_widget, TQT_SIGNAL( addOpenArk( const KURL & ) ), this, - TQT_SLOT( slotAddOpenArk( const KURL & ) ) ); + connect( m_widget, TQ_SIGNAL( removeOpenArk( const KURL &) ), this, + TQ_SLOT( slotRemoveOpenArk( const KURL & ) ) ); + connect( m_widget, TQ_SIGNAL( addOpenArk( const KURL & ) ), this, + TQ_SLOT( slotAddOpenArk( const KURL & ) ) ); setCentralWidget( m_part->widget() ); createGUI( m_part ); @@ -109,24 +109,24 @@ MainWindow::~MainWindow() void MainWindow::setupActions() { - newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT(file_newWindow()), actionCollection(), "new_window"); + newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), this, + TQ_SLOT(file_newWindow()), actionCollection(), "new_window"); - newArchAction = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection()); - openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection()); + newArchAction = KStdAction::openNew(this, TQ_SLOT(file_new()), actionCollection()); + openAction = KStdAction::open(this, TQ_SLOT(file_open()), actionCollection()); - reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this), - TQT_SLOT(file_reload()), actionCollection(), "reload_arch"); - closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection(), "file_close"); + reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), this, + TQ_SLOT(file_reload()), actionCollection(), "reload_arch"); + closeAction = KStdAction::close(this, TQ_SLOT(file_close()), actionCollection(), "file_close"); - recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection()); + recent = KStdAction::openRecent(this, TQ_SLOT(openURL(const KURL&)), actionCollection()); recent->loadEntries(kapp->config()); createStandardStatusBarAction(); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(window_close()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeyBindings()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(window_close()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(editToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT( slotConfigureKeyBindings()), actionCollection()); openAction->setEnabled( true ); recent->setEnabled( true ); @@ -179,7 +179,7 @@ MainWindow::editToolbars() { saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") ); KEditToolbar dlg( factory(), this ); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } @@ -462,10 +462,10 @@ MainWindow::startProgressDialog( const TQString & text ) progressDialog->setMinimumDuration( 500 ); progressDialog->show(); KDialog::centerOnScreen( progressDialog ); - connect( progressDialog, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( window_close() ) ); + connect( progressDialog, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( window_close() ) ); timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgress() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgress() ) ); timer->start( 200, false ); } diff --git a/ark/mainwindow.h b/ark/mainwindow.h index b77dec5..d0b7a89 100644 --- a/ark/mainwindow.h +++ b/ark/mainwindow.h @@ -40,7 +40,7 @@ class ArkWidget; class MainWindow: public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow( TQWidget *parent=0, const char *name=0 ); diff --git a/ark/rar.cpp b/ark/rar.cpp index 3c5d8fa..940cf1e 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -126,7 +126,7 @@ bool RarArch::processLine( const TQCString &line ) } TQStringList entry; - TQStringList parsedData = TQStringList::split(QChar(' '), uline); + TQStringList parsedData = TQStringList::split(TQChar(' '), uline); if (m_version < VERSION_5) { if (m_isFirstLine) @@ -211,12 +211,12 @@ void RarArch::open() *kp << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -297,12 +297,12 @@ void RarArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -354,12 +354,12 @@ void RarArch::unarchFileInternal() *kp << m_destDir ; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -390,12 +390,12 @@ void RarArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -418,12 +418,12 @@ void RarArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -36,7 +36,7 @@ class ArkWidget; class RarArch : public Arch { - Q_OBJECT + TQ_OBJECT public: RarArch( ArkWidget *_gui, const TQString & _fileName ); diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp index 498e3e3..1ea1d0c 100644 --- a/ark/searchbar.cpp +++ b/ark/searchbar.cpp @@ -35,7 +35,7 @@ SearchBar::SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name ) : TDEListViewSearchLine( parent, 0, name ) { - TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" ); + TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, this, TQ_SLOT( clear() ), aC, "reset_search" ); resetSearch->plug( parent ); resetSearch->setWhatsThis( i18n( "Reset Search\n" diff --git a/ark/searchbar.h b/ark/searchbar.h index c4a1396..7a9a6f9 100644 --- a/ark/searchbar.h +++ b/ark/searchbar.h @@ -31,7 +31,7 @@ class TDEActionCollection; class SearchBar: public TDEListViewSearchLine { - Q_OBJECT + TQ_OBJECT public: SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name = 0 ); diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index e6823c0..901d76c 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -102,12 +102,12 @@ void SevenZipArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "l" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -150,12 +150,12 @@ void SevenZipArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -195,12 +195,12 @@ void SevenZipArch::remove( TQStringList *list ) *kp << *it; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -249,12 +249,12 @@ void SevenZipArch::unarchFileInternal( ) *kp << "-o" + m_destDir ; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -405,12 +405,12 @@ void SevenZipArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { diff --git a/ark/sevenzip.h b/ark/sevenzip.h index 8eaadc5..2c16079 100644 --- a/ark/sevenzip.h +++ b/ark/sevenzip.h @@ -28,7 +28,7 @@ class SevenZipArch : public Arch { - Q_OBJECT + TQ_OBJECT public: SevenZipArch( ArkWidget *, const TQString & ); diff --git a/ark/tar.cpp b/ark/tar.cpp index cef9596..0cef2dc 100644 --- a/ark/tar.cpp +++ b/ark/tar.cpp @@ -156,13 +156,13 @@ void TarArch::updateArch() *kp << "cat" << tmpfile; - connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(updateProgress( TDEProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - (Arch *)this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(updateProgress( TDEProcess *, char *, int ))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + (Arch *)this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(updateFinished(TDEProcess *)) ); + connect(kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(updateFinished(TDEProcess *)) ); if ( !fd || kp->start(TDEProcess::NotifyOnExit, flag) == false) { @@ -269,12 +269,12 @@ void TarArch::open() m_header_removed = false; m_finished = false; - connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotListingDone(TDEProcess *))); - connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput( TDEProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect(kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotListingDone(TDEProcess *))); + connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput( TDEProcess *, char *, int ))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -291,7 +291,7 @@ void TarArch::open() } else { - connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( openFirstCreateTempDone() ) ); + connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( openFirstCreateTempDone() ) ); createTmp(); } } @@ -301,7 +301,7 @@ void TarArch::openFirstCreateTempDone() if ( compressed && ( m_fileMimeType != "application/x-tgz" ) && ( m_fileMimeType != "application/x-tbz" ) ) { - disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( openFirstCreateTempDone() ) ); + disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( openFirstCreateTempDone() ) ); Q_ASSERT( !m_listingThread ); m_listingThread = new TarListingThread( this, tmpfile ); } @@ -409,12 +409,12 @@ void TarArch::createTmp() } *kp << "-c" << m_filename; - connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(createTmpFinished(TDEProcess *))); - connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(createTmpProgress( TDEProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect(kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(createTmpFinished(TDEProcess *))); + connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(createTmpProgress( TDEProcess *, char *, int ))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); if (kp->start(TDEProcess::NotifyOnExit, flag ) == false) { KMessageBox::error(0, i18n("Unable to fork a decompressor")); @@ -514,22 +514,22 @@ void TarArch::addFile( const TQStringList& urls ) // first. So we'll first delete all the old files matching the names of // those in urls. m_bNotifyWhenDeleteFails = false; - connect( this, TQT_SIGNAL( removeDone() ), this, TQT_SLOT( deleteOldFilesDone() ) ); + connect( this, TQ_SIGNAL( removeDone() ), this, TQ_SLOT( deleteOldFilesDone() ) ); deleteOldFiles(urls, ArkSettings::replaceOnlyWithNewer()); } void TarArch::deleteOldFilesDone() { - disconnect( this, TQT_SIGNAL( removeDone() ), this, TQT_SLOT( deleteOldFilesDone() ) ); + disconnect( this, TQ_SIGNAL( removeDone() ), this, TQ_SLOT( deleteOldFilesDone() ) ); m_bNotifyWhenDeleteFails = true; - connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( addFileCreateTempDone() ) ); + connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( addFileCreateTempDone() ) ); createTmp(); } void TarArch::addFileCreateTempDone() { - disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( addFileCreateTempDone() ) ); + disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( addFileCreateTempDone() ) ); TQStringList * urls = &m_filesToAdd; TDEProcess *kp = m_currentProcess = new TDEProcess; @@ -562,13 +562,13 @@ void TarArch::addFileCreateTempDone() kdDebug(1601) << *strTemp << " " << endl; } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddFinished(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddFinished(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -579,13 +579,13 @@ void TarArch::addFileCreateTempDone() void TarArch::slotAddFinished(TDEProcess *_kp) { - disconnect( _kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddFinished(TDEProcess*))); + disconnect( _kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddFinished(TDEProcess*))); m_pTmpProc = _kp; m_filesToAdd = TQStringList(); if ( compressed ) { - connect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( addFinishedUpdateDone() ) ); + connect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( addFinishedUpdateDone() ) ); updateArch(); } else @@ -595,7 +595,7 @@ void TarArch::slotAddFinished(TDEProcess *_kp) void TarArch::addFinishedUpdateDone() { if ( compressed ) - disconnect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( addFinishedUpdateDone() ) ); + disconnect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( addFinishedUpdateDone() ) ); Arch::slotAddExited( m_pTmpProc ); // this will delete _kp m_pTmpProc = NULL; } @@ -641,13 +641,13 @@ void TarArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotExtractExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotExtractExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -661,13 +661,13 @@ void TarArch::remove(TQStringList *list) { deleteInProgress = true; m_filesToRemove = *list; - connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( removeCreateTempDone() ) ); + connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( removeCreateTempDone() ) ); createTmp(); } void TarArch::removeCreateTempDone() { - disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( removeCreateTempDone() ) ); + disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( removeCreateTempDone() ) ); TQString name, tmp; TDEProcess *kp = m_currentProcess = new TDEProcess; @@ -685,13 +685,13 @@ void TarArch::removeCreateTempDone() } m_filesToRemove = TQStringList(); - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotDeleteExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotDeleteExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -705,7 +705,7 @@ void TarArch::slotDeleteExited(TDEProcess *_kp) m_pTmpProc2 = _kp; if ( compressed ) { - connect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( removeUpdateDone() ) ); + connect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( removeUpdateDone() ) ); updateArch(); } else @@ -715,7 +715,7 @@ void TarArch::slotDeleteExited(TDEProcess *_kp) void TarArch::removeUpdateDone() { if ( compressed ) - disconnect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( removeUpdateDone() ) ); + disconnect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( removeUpdateDone() ) ); deleteInProgress = false; emit removeDone(); @@ -806,12 +806,12 @@ void TarArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -821,4 +821,3 @@ void TarArch::test() } #include "tar.moc" -// kate: space-indent on; @@ -55,7 +55,7 @@ class TarListingThread; class TarArch : public Arch { - Q_OBJECT + TQ_OBJECT public: TarArch( ArkWidget *_gui, const TQString & _filename, diff --git a/ark/tarlistingthread.cpp b/ark/tarlistingthread.cpp index 9d903c3..2cd7ef7 100644 --- a/ark/tarlistingthread.cpp +++ b/ark/tarlistingthread.cpp @@ -148,7 +148,7 @@ void TarListingThread::processDir( const KTarDirectory *tardir, const TQString & strSize.sprintf("%d", ((KTarFile *)tarEntry)->size()); } col_list.append(strSize); - TQString timestamp = tarEntry->datetime().toString(Qt::ISODate); + TQString timestamp = tarEntry->datetime().toString(TQt::ISODate); col_list.append(timestamp); col_list.append(tarEntry->symlink()); diff --git a/ark/zip.cpp b/ark/zip.cpp index 392cc5c..f8b5281 100644 --- a/ark/zip.cpp +++ b/ark/zip.cpp @@ -94,12 +94,12 @@ void ZipArch::open() *kp << m_unarchiver_program << "-v" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -172,12 +172,12 @@ void ZipArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -231,12 +231,12 @@ void ZipArch::unarchFileInternal() *kp << "-d" << m_destDir; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -268,12 +268,12 @@ void ZipArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -296,12 +296,12 @@ void ZipArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -37,7 +37,7 @@ class ArkWidget; class ZipArch : public Arch { - Q_OBJECT + TQ_OBJECT public: ZipArch( ArkWidget *_gui, const TQString & _fileName ); diff --git a/ark/zoo.cpp b/ark/zoo.cpp index aa96d47..79ba8a9 100644 --- a/ark/zoo.cpp +++ b/ark/zoo.cpp @@ -110,12 +110,12 @@ void ZooArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "l" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -177,12 +177,12 @@ void ZooArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -236,12 +236,12 @@ void ZooArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -267,12 +267,12 @@ void ZooArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -35,7 +35,7 @@ class ArkWidget; class ZooArch : public Arch { - Q_OBJECT + TQ_OBJECT public: ZooArch( ArkWidget *, const TQString & ); |