diff options
Diffstat (limited to 'kmailcvt')
27 files changed, 115 insertions, 112 deletions
diff --git a/kmailcvt/README b/kmailcvt/README index dbdf247a8..b97f783e8 100644 --- a/kmailcvt/README +++ b/kmailcvt/README @@ -23,7 +23,7 @@ the following methods that you may want to use: void setOverall( int percent = 0 ); // Set overall percentage void addLog( const QString& log ); // Add a message for the user to see void alert( const QString& message ); // Tell user something has gone wrong - QWidget *parent(); // The parent widget + QWidget *tqparent(); // The tqparent widget bool removeDupMsg; // true, if user selected 'remove duplicated messages' diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx index 121171af6..f1d9eaff1 100644 --- a/kmailcvt/filter_evolution.cxx +++ b/kmailcvt/filter_evolution.cxx @@ -51,7 +51,7 @@ void FilterEvolution::import(FilterInfo *info) evolDir = TQDir::homeDirPath(); } - mailDir = KFileDialog::getExistingDirectory(evolDir, info->parent()); + mailDir = KFileDialog::getExistingDirectory(evolDir, info->tqparent()); if (mailDir.isEmpty()) { info->alert(i18n("No directory selected.")); @@ -69,7 +69,7 @@ void FilterEvolution::import(FilterInfo *info) TQStringList rootSubDirs = dir.entryList("[^\\.]*", TQDir::Dirs, TQDir::Name); // Removal of . and .. int currentDir = 1, numSubDirs = rootSubDirs.size(); for(TQStringList::Iterator filename = rootSubDirs.begin() ; filename != rootSubDirs.end() ; ++filename, ++currentDir) { - importDirContents(info, dir.filePath(*filename), *filename, TQString::null); + importDirContents(info, dir.filePath(*filename), *filename, TQString()); info->setOverall((int) ((float) currentDir / numSubDirs * 100)); } } diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx index 959a4b468..b8842e961 100644 --- a/kmailcvt/filter_evolution_v2.cxx +++ b/kmailcvt/filter_evolution_v2.cxx @@ -54,7 +54,7 @@ void FilterEvolution_v2::import(FilterInfo *info) evolDir = TQDir::homeDirPath(); } - //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent()); + //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent()); KFileDialog *kfd; kfd = new KFileDialog( evolDir, "", 0, "kfiledialog", true ); kfd->setMode(KFile::Directory | KFile::LocalOnly); @@ -85,7 +85,7 @@ void FilterEvolution_v2::import(FilterInfo *info) } /** import last but not least all archives from the root-dir */ - importDirContents(info, true, mailDir, TQString::null, TQString::null); + importDirContents(info, true, mailDir, TQString(), TQString()); info->addLog( i18n("Finished importing emails from %1").arg( mailDir )); if(count_duplicates > 0) { @@ -125,7 +125,7 @@ void FilterEvolution_v2::importDirContents(FilterInfo *info, bool root, if (!root) importMBox(info, (dirName + "/" + temp_mailfile) , KMailRootDir, KMailSubDir); else - importMBox(info, dirName + temp_mailfile , temp_mailfile, TQString::null); + importMBox(info, dirName + temp_mailfile , temp_mailfile, TQString()); } } diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx index 2a1961567..081a2fda3 100644 --- a/kmailcvt/filter_kmail_maildir.cxx +++ b/kmailcvt/filter_kmail_maildir.cxx @@ -115,7 +115,7 @@ void FilterKMail_maildir::importDirContents( FilterInfo *info, const TQString& d /** - * Extract the X-Status flag from a mailfile + * Extract the X-tqStatus flag from a mailfile * @param info Information storage for the operation. * @param fileName The full path to the file to import */ @@ -136,9 +136,9 @@ TQString FilterKMail_maildir::getMessageFlags( FilterInfo *info, const TQString& while ( ! mailfile.atEnd() && mailfile.readLine(input.data(),MAX_LINE) ) { - if ((seperate = input.data()).left(10) == "X-Status: ") { + if ((seperate = input.data()).left(10) == "X-tqStatus: ") { status_flag = seperate; - status_flag.remove("X-Status: "); + status_flag.remove("X-tqStatus: "); status_flag = status_flag.stripWhiteSpace(); // qDebug("status_flag: %s", status_flag.latin1() ); break; diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx index 4bd3c423f..c14d32adf 100644 --- a/kmailcvt/filter_lnotes.cxx +++ b/kmailcvt/filter_lnotes.cxx @@ -53,7 +53,7 @@ void FilterLNotes::import(FilterInfo *info) { totalFiles = 0; TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("All Files (*)"), - inf->parent() ); + inf->tqparent() ); totalFiles = filenames.count(); inf->setOverall(0); diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx index 901fa6982..f1c3bc727 100644 --- a/kmailcvt/filter_mailapp.cxx +++ b/kmailcvt/filter_mailapp.cxx @@ -45,7 +45,7 @@ void FilterMailApp::import(FilterInfo *info) int overall_status = 0; bool first_msg = true; - TQString directory = KFileDialog::getExistingDirectory( TQDir::homeDirPath(), info->parent() ); + TQString directory = KFileDialog::getExistingDirectory( TQDir::homeDirPath(), info->tqparent() ); //qDebug("starting by looking in directory: %s", directory.latin1()); if ( directory.isEmpty() ) { @@ -144,8 +144,8 @@ void FilterMailApp::traverseDirectory(FilterInfo *info, const TQString &dirName) TQDir dir(dirName); dir.setFilter(TQDir::Dirs | TQDir::Files); - const QFileInfoList *fileinfolist = dir.entryInfoList(); - QFileInfoListIterator it(*fileinfolist); + const TQFileInfoList *fileinfolist = dir.entryInfoList(); + TQFileInfoListIterator it(*fileinfolist); TQFileInfo *fi; if ( info->shouldTerminate() ) return; diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx index 61f313391..0a7b08ff1 100644 --- a/kmailcvt/filter_mbox.cxx +++ b/kmailcvt/filter_mbox.cxx @@ -45,7 +45,7 @@ void FilterMBox::import(FilterInfo *info) int overall_status = 0; bool first_msg = true; - TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("mbox Files (*)"), info->parent() ); + TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("mbox Files (*)"), info->tqparent() ); info->setOverall(0); for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename, ++currentFile) { @@ -91,14 +91,14 @@ void FilterMBox::import(FilterInfo *info) while ( ! mbox.atEnd() && (l = mbox.readLine(input.data(),MAX_LINE)) && ((seperate = input.data()).left(5) != "From ")) { tmp.file()->writeBlock( input, l ); - if ((seperate = input.data()).left(10) == "X-Status: ") { + if ((seperate = input.data()).left(10) == "X-tqStatus: ") { x_status_flag = seperate; - x_status_flag.remove("X-Status: "); + x_status_flag.remove("X-tqStatus: "); x_status_flag = x_status_flag.stripWhiteSpace(); // qDebug("x_status_flag: %s", x_status_flag.latin1() ); } - // workaround to fix hang if a corrupted mbox tqcontains some + // workaround to fix hang if a corrupted mbox contains some // binary data, for more see bug #106796 if (mbox.at() == filepos) mbox.at(mbox.size()); diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx index c60eced67..fb9d552a3 100644 --- a/kmailcvt/filter_oe.cxx +++ b/kmailcvt/filter_oe.cxx @@ -55,7 +55,7 @@ FilterOE::~FilterOE() void FilterOE::import(FilterInfo *info) { // Select directory containing plain text emails - mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->parent()); + mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->tqparent()); if (mailDir.isEmpty()) { // No directory selected info->alert(i18n("No directory selected.")); return; @@ -167,7 +167,7 @@ void FilterOE::mbxImport( FilterInfo *info, TQDataStream& ds) // Read the header ds >> msgCount >> lastMsgNum >> fileSize; - ds.device()->at( ds.device()->at() + 64 ); // Skip 0's + ds.tqdevice()->at( ds.tqdevice()->at() + 64 ); // Skip 0's kdDebug() << "This mailbox has " << msgCount << " messages" << endl; if (msgCount == 0) return; // Don't import empty mailbox @@ -212,9 +212,9 @@ void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds) { // Get item count & offset of index TQ_UINT32 itemCount, indexPtr; - ds.device()->at(0xc4); + ds.tqdevice()->at(0xc4); ds >> itemCount; - ds.device()->at(0xe4); + ds.tqdevice()->at(0xe4); ds >> indexPtr; kdDebug() << "Item count is " << itemCount << ", Index at " << indexPtr << endl; @@ -223,7 +223,7 @@ void FilterOE::dbxImport( FilterInfo *info, TQDataStream& ds) totalEmails = itemCount; currentEmail = 0; // Parse the indexes - ds.device()->at(indexPtr); + ds.tqdevice()->at(indexPtr); dbxReadIndex(info, ds, indexPtr); } @@ -231,15 +231,15 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) { if(info->shouldTerminate()) return; - TQ_UINT32 self, unknown, nextIndexPtr, parent, indexCount; + TQ_UINT32 self, unknown, nextIndexPtr, tqparent, indexCount; TQ_UINT8 unknown2, ptrCount; TQ_UINT16 unknown3; - int wasAt = ds.device()->at(); - ds.device()->at(filePos); + int wasAt = ds.tqdevice()->at(); + ds.tqdevice()->at(filePos); kdDebug() << "Reading index of file " << folderName << endl; - ds >> self >> unknown >> nextIndexPtr >> parent >> unknown2 >> ptrCount >> unknown3 >> indexCount; // _dbx_tableindexstruct + ds >> self >> unknown >> nextIndexPtr >> tqparent >> unknown2 >> ptrCount >> unknown3 >> indexCount; // _dbx_tableindexstruct kdDebug() << "This index has " << (int) ptrCount << " data pointers" << endl; for (int count = 0; count < ptrCount; count++) { @@ -260,7 +260,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos) dbxReadIndex(info, ds, nextIndexPtr); } - ds.device()->at(wasAt); // Restore file position to same as when function called + ds.tqdevice()->at(wasAt); // Restore file position to same as when function called } void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos) @@ -268,11 +268,11 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos TQ_UINT32 curOffset, blockSize; TQ_UINT16 unknown; TQ_UINT8 count, unknown2; - int wasAt = ds.device()->at(); + int wasAt = ds.tqdevice()->at(); TQString folderEntry[4]; - ds.device()->at(filePos); + ds.tqdevice()->at(filePos); ds >> curOffset >> blockSize >> unknown >> count >> unknown2; // _dbx_email_headerstruct kdDebug() << "Data block has " << (int) count << " elements" << endl; @@ -284,7 +284,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos ds >> type >> value; value &= 0xffffff; - ds.device()->at(ds.device()->at() - 1); // We only wanted 3 bytes + ds.tqdevice()->at(ds.tqdevice()->at() - 1); // We only wanted 3 bytes if(!currentIsFolderFile) { if (type == 0x84) { // It's an email! @@ -292,12 +292,12 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos dbxReadEmail(info, ds, value); ++count0x84; } else if( type == 0x04) { - int currentFilePos = ds.device()->at(); - ds.device()->at(filePos + 12 + value + (count*4) ); + int currentFilePos = ds.tqdevice()->at(); + ds.tqdevice()->at(filePos + 12 + value + (count*4) ); TQ_UINT32 newOFF; ds >> newOFF; kdDebug() << "**** Offset of emaildata (0x04) " << newOFF << endl; - ds.device()->at(currentFilePos); + ds.tqdevice()->at(currentFilePos); dbxReadEmail(info, ds, newOFF); ++count0x04; } @@ -316,7 +316,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos folderEntry[2] = TQString::number(value); } else if (type == 0x81) { - // kdDebug() << "**** FOLDER: parent ID ****" << endl; + // kdDebug() << "**** FOLDER: tqparent ID ****" << endl; folderEntry[3] = TQString::number(value); } } @@ -324,7 +324,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos if(currentIsFolderFile) { folderStructure.append(folderEntry); } - ds.device()->at(wasAt); // Restore file position to same as when function called + ds.tqdevice()->at(wasAt); // Restore file position to same as when function called } void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) @@ -335,8 +335,8 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) TQ_UINT8 intCount, unknown; KTempFile tmp; bool _break = false; - int wasAt = ds.device()->at(); - ds.device()->at(filePos); + int wasAt = ds.tqdevice()->at(); + ds.tqdevice()->at(filePos); do { ds >> self >> nextAddressOffset >> blockSize >> intCount >> unknown >> nextAddress; // _dbx_block_hdrstruct @@ -348,7 +348,7 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) _break = true; break; } - ds.device()->at(nextAddress); + ds.tqdevice()->at(nextAddress); } while (nextAddress != 0); tmp.close(); @@ -361,7 +361,7 @@ void FilterOE::dbxReadEmail( FilterInfo *info, TQDataStream& ds, int filePos) currentEmail++; int currentPercentage = (int) ( ( (float) currentEmail / totalEmails ) * 100 ); info->setCurrent(currentPercentage); - ds.device()->at(wasAt); + ds.tqdevice()->at(wasAt); } tmp.unlink(); } @@ -371,18 +371,18 @@ TQString FilterOE::parseFolderString( TQDataStream& ds, int filePos ) { char tmp; TQString returnString; - int wasAt = ds.device()->at(); - ds.device()->at(filePos); + int wasAt = ds.tqdevice()->at(); + ds.tqdevice()->at(filePos); // read while != 0x00 - while( !ds.device()->atEnd() ) { - tmp = ds.device()->getch(); + while( !ds.tqdevice()->atEnd() ) { + tmp = ds.tqdevice()->getch(); if( tmp != 0x00) { returnString += tmp; } else break; } - ds.device()->at(wasAt); + ds.tqdevice()->at(wasAt); return returnString; } @@ -410,9 +410,9 @@ TQString FilterOE::getFolderName(TQString filename) } } else { TQString _currentID = tmp[2]; - TQString _parentID = tmp[3]; + TQString _tqparentID = tmp[3]; if(_currentID == search) { - if(_parentID.isEmpty()) { // this is the root of the folder + if(_tqparentID.isEmpty()) { // this is the root of the folder found = true; break; } else { diff --git a/kmailcvt/filter_oe.hxx b/kmailcvt/filter_oe.hxx index 821aa5dfa..e0e990c1d 100644 --- a/kmailcvt/filter_oe.hxx +++ b/kmailcvt/filter_oe.hxx @@ -68,7 +68,7 @@ private: // Private methods 1. descriptive folder name 2. filename 3. ID of current folder - 4. ID of parent folder + 4. ID of tqparent folder */ typedef FolderStructureBase<4> FolderStructure; /** matrix with information about the folder structure*/ diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx index 65e2eae4b..d584263d5 100644 --- a/kmailcvt/filter_opera.cxx +++ b/kmailcvt/filter_opera.cxx @@ -48,7 +48,7 @@ void FilterOpera::import(FilterInfo *info) startdir = TQDir::homeDirPath(); } - //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent()); + //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent()); KFileDialog *kfd; kfd = new KFileDialog( startdir, "", 0, "kfiledialog", true ); kfd->setMode(KFile::Directory | KFile::LocalOnly); @@ -114,7 +114,7 @@ void FilterOpera::import(FilterInfo *info) tmp.file()->writeBlock( input, l ); while ( ! operaArchiv.atEnd() && (l = operaArchiv.readLine(input.data(),MAX_LINE)) && ((seperate = input.data()).left(5) != "From ")) { - /** remove in KMail unneeded Flags from Opera (for example: X-Opera-Status)*/ + /** remove in KMail unneeded Flags from Opera (for example: X-Opera-tqStatus)*/ if(seperate.left(8) != "X-Opera-") tmp.file()->writeBlock( input, l ); } diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx index a5a9f407c..bbb32de79 100644 --- a/kmailcvt/filter_outlook.cxx +++ b/kmailcvt/filter_outlook.cxx @@ -50,7 +50,7 @@ void FilterOutlook::import(FilterInfo *info) info->addLog(i18n("No files found for import.")); TQString outlookDir; - outlookDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent()); + outlookDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent()); TQDir importDir (outlookDir); TQStringList files = importDir.entryList("*.[pP][sS][tT]", TQDir::Files, TQDir::Name); for ( TQStringList::Iterator pstFile = files.begin(); pstFile != files.end(); ++pstFile) { diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx index 04abea3d3..45cdbf88f 100644 --- a/kmailcvt/filter_plain.cxx +++ b/kmailcvt/filter_plain.cxx @@ -39,7 +39,7 @@ FilterPlain::~FilterPlain() void FilterPlain::import(FilterInfo *info) { // Select directory containing plain text emails - TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->parent()); + TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->tqparent()); if (mailDir.isEmpty()) { // No directory selected info->alert(i18n("No directory selected.")); return; diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx index 126a6365a..f0386d902 100644 --- a/kmailcvt/filter_pmail.cxx +++ b/kmailcvt/filter_pmail.cxx @@ -94,8 +94,8 @@ void FilterPMail::processFiles(const TQString& tqmask, void(FilterPMail::* workF inf->setFrom(mailfileinfo.fileName()); // Clear the other fields - inf->setTo(TQString::null); - inf->setCurrent(TQString::null); + inf->setTo(TQString()); + inf->setCurrent(TQString()); inf->setCurrent(-1); // call worker function, increase progressbar @@ -186,7 +186,7 @@ void FilterPMail::importMailFolder(const TQString& file) f.at(f.at() - l + 1); } - // no problem to loose the last line in file. This only tqcontains a seperate char + // no problem to loose the last line in file. This only contains a seperate char while ( ! f.atEnd() && (l = f.readLine(input.data(),MAX_LINE))) { if (inf->shouldTerminate()){ tempfile.close(); diff --git a/kmailcvt/filter_pmail.hxx b/kmailcvt/filter_pmail.hxx index d3ac1e60a..86f08ce6d 100644 --- a/kmailcvt/filter_pmail.hxx +++ b/kmailcvt/filter_pmail.hxx @@ -53,11 +53,11 @@ private: /** Folder structure here has 5 entries. */ typedef FolderStructureBase<5> FolderStructure; - /** List with the folder matrix, which tqcontains following strings: + /** List with the folder matrix, which contains following strings: 1. type (2 for root-folder, 1 for folder, 0 for mailarchiv) 2. type (1 for root-folder, 3 for folder, 0 for mailarchiv) 3. "ID:flag:filename" of folder/archiv - 4. "ID:name" of parent folder + 4. "ID:name" of tqparent folder 5. name of folder/archiv */ TQValueList<FolderStructure> folderMatrix; diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx index 63345f01b..9d6b219ae 100644 --- a/kmailcvt/filter_sylpheed.cxx +++ b/kmailcvt/filter_sylpheed.cxx @@ -166,8 +166,8 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName) void FilterSylpheed::readMarkFile( FilterInfo *info, const TQString &path, TQDict<unsigned long> &dict ) { - /* Each sylpheed mail directory tqcontains a .sylpheed_mark file which - * tqcontains all the flags for each messages. The tqlayout of this file + /* Each sylpheed mail directory contains a .sylpheed_mark file which + * contains all the flags for each messages. The tqlayout of this file * is documented in the source code of sylpheed: in procmsg.h for * the flag bits, and procmsg.c. * diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx index 98d23cb66..b2e737dad 100644 --- a/kmailcvt/filter_thebat.cxx +++ b/kmailcvt/filter_thebat.cxx @@ -157,7 +157,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) // if you use readLine() to read from a file with binary data // TQFile::at() and TQFile::atEnd() return wrong value. So we // never get TQFile::atEnd() == true in some cases. This looks - // like a bug in Qt3 maybe fixed in Qt4. + // like a bug in TQt3 maybe fixed in TQt4. // while((l = tbb.readBlock(input.data(),50)) ) { if(info->shouldTerminate()) { @@ -178,7 +178,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) } } else { ++count; - endOfEmail = (tbb.at() - l + _tmp.find(regexp)); + endOfEmail = (tbb.at() - l + _tmp.tqfind(regexp)); offsets.append(endOfEmail); } } @@ -213,7 +213,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName) tmp.file()->writeBlock( input, endPos-lastPos ); tmp.close(); - //KMessageBox::warningContinueCancel(info->parent(), ""); + //KMessageBox::warningContinueCancel(info->tqparent(), ""); if(info->removeDupMsg) addMessage( info, _path, tmp.name() ); else diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx index c6f3cd098..a058e28d3 100644 --- a/kmailcvt/filter_thunderbird.cxx +++ b/kmailcvt/filter_thunderbird.cxx @@ -92,7 +92,7 @@ void FilterThunderbird::import(FilterInfo *info) if (temp_mailfile.endsWith(".msf") || temp_mailfile.endsWith("msgFilterRules.dat")) {} else { info->addLog( i18n("Start import file %1...").arg( temp_mailfile ) ); - importMBox(info, mailDir + temp_mailfile , temp_mailfile, TQString::null); + importMBox(info, mailDir + temp_mailfile , temp_mailfile, TQString()); } } diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx index 1028e69c7..02f83097a 100644 --- a/kmailcvt/filters.cxx +++ b/kmailcvt/filters.cxx @@ -35,9 +35,9 @@ bool FilterInfo::s_terminateASAP = false; -FilterInfo::FilterInfo( KImportPageDlg* dlg, TQWidget* parent , bool _removeDupMsg) +FilterInfo::FilterInfo( KImportPageDlg* dlg, TQWidget* tqparent , bool _removeDupMsg) : m_dlg( dlg ), - m_parent( parent ) + m_tqparent( tqparent ) { removeDupMsg = _removeDupMsg; s_terminateASAP = false; @@ -49,7 +49,7 @@ FilterInfo::~FilterInfo() void FilterInfo::seStatusMsg( const TQString& status ) { - m_dlg->_texStatus->setText( status ); + m_dlg->_textqStatus->setText( status ); } void FilterInfo::setFrom( const TQString& from ) @@ -92,14 +92,14 @@ void FilterInfo::clear() m_dlg->_log->clear(); setCurrent(); setOverall(); - setCurrent( TQString::null ); - setFrom( TQString::null ); - setTo( TQString::null ); + setCurrent( TQString() ); + setFrom( TQString() ); + setTo( TQString() ); } void FilterInfo::alert( const TQString& message ) { - KMessageBox::information( m_parent, message ); + KMessageBox::information( m_tqparent, message ); } void FilterInfo::terminateASAP() @@ -136,7 +136,7 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName, msgURL.setPath( msgPath ); if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) - KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started + KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", folderName, msgURL, msgStatusFlags ); @@ -172,7 +172,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName msgURL.setPath( msgPath ); if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) - KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started + KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage_fastImport", folderName, msgURL, msgStatusFlags ); if ( !reply.isValid() ) @@ -200,7 +200,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName void Filter::showKMailImportArchiveDialog( FilterInfo* info ) { if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) - KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started + KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "showImportArchiveDialog" ); if ( !reply.isValid() ) diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.hxx index b680ab5e0..a5f468e43 100644 --- a/kmailcvt/filters.hxx +++ b/kmailcvt/filters.hxx @@ -33,7 +33,7 @@ class FilterInfo { public: - FilterInfo(KImportPageDlg *dlg, TQWidget *parent, bool _removeDupMsg); + FilterInfo(KImportPageDlg *dlg, TQWidget *tqparent, bool _removeDupMsg); ~FilterInfo(); void seStatusMsg( const TQString& status ); @@ -48,12 +48,12 @@ class FilterInfo static void terminateASAP(); bool shouldTerminate(); - TQWidget *parent() { return m_parent; } + TQWidget *tqparent() { return m_tqparent; } bool removeDupMsg; private: KImportPageDlg *m_dlg; - TQWidget *m_parent; + TQWidget *m_tqparent; static bool s_terminateASAP; }; @@ -61,7 +61,7 @@ class Filter { public: Filter( const TQString& name, const TQString& author, - const TQString& info = TQString::null ); + const TQString& info = TQString() ); virtual ~Filter() {} virtual void import( FilterInfo* ) = 0; TQString author() const { return m_author; } @@ -91,7 +91,7 @@ class Filter /** -* Glorified QString[N] for (a) understandability (b) older gcc compatibility. +* Glorified TQString[N] for (a) understandability (b) older gcc compatibility. */ template <unsigned int size> class FolderStructureBase { @@ -100,7 +100,7 @@ public: /** Constructor. Need a default constructor for TQValueList. */ FolderStructureBase() {} ; - /** Constructor. Turn N QStrings into a folder structure + /** Constructor. Turn N TQStrings into a folder structure * description. */ FolderStructureBase(const NString &s) @@ -128,7 +128,7 @@ public: */ const TQString operator [](unsigned int i) const { - if (i<size) return d[i]; else return TQString::null; + if (i<size) return d[i]; else return TQString(); } ; /** Access the different fields, for writing. */ diff --git a/kmailcvt/kimportpage.cpp b/kmailcvt/kimportpage.cpp index 62e5b7de7..5c62fb00c 100644 --- a/kmailcvt/kimportpage.cpp +++ b/kmailcvt/kimportpage.cpp @@ -21,7 +21,7 @@ #include "kimportpage.h" -KImportPage::KImportPage(TQWidget *parent, const char *name ) : KImportPageDlg(parent,name) { +KImportPage::KImportPage(TQWidget *tqparent, const char *name ) : KImportPageDlg(tqparent,name) { mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png")); } diff --git a/kmailcvt/kimportpage.h b/kmailcvt/kimportpage.h index 0b014824f..b7f4de53e 100644 --- a/kmailcvt/kimportpage.h +++ b/kmailcvt/kimportpage.h @@ -22,8 +22,9 @@ class KImportPage : public KImportPageDlg { Q_OBJECT + TQ_OBJECT public: - KImportPage(TQWidget *parent=0, const char *name=0); + KImportPage(TQWidget *tqparent=0, const char *name=0); ~KImportPage(); }; diff --git a/kmailcvt/kimportpagedlg.ui b/kmailcvt/kimportpagedlg.ui index 88366d6bb..b0d6e835e 100644 --- a/kmailcvt/kimportpagedlg.ui +++ b/kmailcvt/kimportpagedlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KImportPageDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KImportPageDlg</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mIntroSidebar</cstring> </property> @@ -67,7 +67,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout16</cstring> </property> @@ -75,7 +75,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout90</cstring> </property> @@ -83,7 +83,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -91,7 +91,7 @@ <string>From:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -99,7 +99,7 @@ <string>To:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -107,9 +107,9 @@ <string>Current:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>_texStatus</cstring> + <cstring>_textqStatus</cstring> </property> <property name="text"> <string>Importing in progress...</string> @@ -118,7 +118,7 @@ <set>AlignTop</set> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>_current</cstring> </property> @@ -134,7 +134,7 @@ <string>...</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>_to</cstring> </property> @@ -150,7 +150,7 @@ <string>...</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -158,7 +158,7 @@ <string>Total:</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>_from</cstring> </property> @@ -174,24 +174,24 @@ <string>...</string> </property> </widget> - <widget class="QProgressBar" row="5" column="1"> + <widget class="TQProgressBar" row="5" column="1"> <property name="name"> <cstring>_done_overall</cstring> </property> </widget> - <widget class="QProgressBar" row="4" column="1"> + <widget class="TQProgressBar" row="4" column="1"> <property name="name"> <cstring>_done_current</cstring> </property> </widget> </grid> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>_log</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp index 9d5ddbb9b..5334ac52d 100644 --- a/kmailcvt/kmailcvt.cpp +++ b/kmailcvt/kmailcvt.cpp @@ -22,8 +22,8 @@ #include <kdebug.h> #include "filters.hxx" -KMailCVT::KMailCVT(TQWidget *parent, const char *name) - : KWizard(parent, name, true) { +KMailCVT::KMailCVT(TQWidget *tqparent, const char *name) + : KWizard(tqparent, name, true) { setCaption( i18n( "KMailCVT Import Tool" ) ); @@ -41,9 +41,9 @@ KMailCVT::~KMailCVT() { void KMailCVT::endImport() { if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) ) - KApplication::startServiceByDesktopName( "kmail", TQString::null ); // Will wait until kmail is started + KApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started - DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", TQString::null, TQString::null, TQString::null); + DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", TQString(), TQString(), TQString()); if ( !reply.isValid() ) return; reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopResetAddMessage" ); diff --git a/kmailcvt/kmailcvt.h b/kmailcvt/kmailcvt.h index 34907bcc8..e5febb23e 100644 --- a/kmailcvt/kmailcvt.h +++ b/kmailcvt/kmailcvt.h @@ -27,8 +27,9 @@ /** KMailCVT is the base class of the project */ class KMailCVT : public KWizard { Q_OBJECT + TQ_OBJECT public: - KMailCVT(TQWidget* parent=0, const char *name=0); + KMailCVT(TQWidget* tqparent=0, const char *name=0); ~KMailCVT(); virtual void next(); diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp index b8af0d0b3..e8a7ce32d 100644 --- a/kmailcvt/kselfilterpage.cpp +++ b/kmailcvt/kselfilterpage.cpp @@ -39,7 +39,7 @@ #include "kselfilterpage.h" -KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilterPageDlg(parent,name) { +KSelFilterPage::KSelFilterPage(TQWidget *tqparent, const char *name ) : KSelFilterPageDlg(tqparent,name) { mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png")); mFilterList.setAutoDelete( TRUE ); diff --git a/kmailcvt/kselfilterpage.h b/kmailcvt/kselfilterpage.h index 1c5908e1a..4dc4aa6df 100644 --- a/kmailcvt/kselfilterpage.h +++ b/kmailcvt/kselfilterpage.h @@ -25,8 +25,9 @@ template <class T> class TQPtrList; class KSelFilterPage : public KSelFilterPageDlg { Q_OBJECT + TQ_OBJECT public: - KSelFilterPage(TQWidget *parent=0, const char *name=0); + KSelFilterPage(TQWidget *tqparent=0, const char *name=0); ~KSelFilterPage(); public: void addFilter(Filter *f); diff --git a/kmailcvt/kselfilterpagedlg.ui b/kmailcvt/kselfilterpagedlg.ui index 80e2eafea..cb2bd5acc 100644 --- a/kmailcvt/kselfilterpagedlg.ui +++ b/kmailcvt/kselfilterpagedlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KSelFilterPageDlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSelFilterPageDlg</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mIntroSidebar</cstring> </property> @@ -67,7 +67,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>tqlayout19</cstring> </property> @@ -75,7 +75,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -104,7 +104,7 @@ This program will help you import your email from your previous email program in <property name="wordwrap" stdset="0"> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>mFilterCombo</cstring> </property> @@ -117,7 +117,7 @@ This program will help you import your email from your previous email program in </sizepolicy> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>mDesc</cstring> </property> @@ -125,7 +125,7 @@ This program will help you import your email from your previous email program in <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>remDupMsg</cstring> </property> |