summaryrefslogtreecommitdiffstats
path: root/kmailcvt
diff options
context:
space:
mode:
Diffstat (limited to 'kmailcvt')
-rw-r--r--kmailcvt/filter_evolution_v2.cpp2
-rw-r--r--kmailcvt/filter_kmail_maildir.cpp4
-rw-r--r--kmailcvt/filter_lnotes.cpp2
-rw-r--r--kmailcvt/filter_mbox.cpp2
-rw-r--r--kmailcvt/filter_oe.cpp4
-rw-r--r--kmailcvt/filter_sylpheed.cpp2
-rw-r--r--kmailcvt/filter_thebat.cpp2
-rw-r--r--kmailcvt/filter_thunderbird.cpp2
-rw-r--r--kmailcvt/filters.cpp12
-rw-r--r--kmailcvt/kimportpage.cpp2
-rw-r--r--kmailcvt/kmailcvt.cpp2
-rw-r--r--kmailcvt/kselfilterpage.cpp6
12 files changed, 21 insertions, 21 deletions
diff --git a/kmailcvt/filter_evolution_v2.cpp b/kmailcvt/filter_evolution_v2.cpp
index a4c6203c..e0eb6d31 100644
--- a/kmailcvt/filter_evolution_v2.cpp
+++ b/kmailcvt/filter_evolution_v2.cpp
@@ -208,7 +208,7 @@ void FilterEvolution_v2::importMBox(FilterInfo *info, const TQString& mboxName,
if(!targetDir.isNull()) {
if(_targetDir.contains(".sbd"))
_targetDir.remove(".sbd");
- destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE); // mboxName;
+ destFolder += "Evolution-Import/" + _targetDir + "/" + filenameInfo.baseName(true); // mboxName;
} else {
destFolder = "Evolution-Import/" + rootDir;
if(destFolder.contains(".sbd"))
diff --git a/kmailcvt/filter_kmail_maildir.cpp b/kmailcvt/filter_kmail_maildir.cpp
index f24ef7af..df432925 100644
--- a/kmailcvt/filter_kmail_maildir.cpp
+++ b/kmailcvt/filter_kmail_maildir.cpp
@@ -176,8 +176,8 @@ void FilterKMail_maildir::importFiles( FilterInfo *info, const TQString& dirName
if(!generatedPath) {
_path = "KMail-Import";
TQString _tmp = dir.filePath(*mailFile);
- _tmp = _tmp.remove( mailDir ,TRUE);
- TQStringList subFList = TQStringList::split("/",_tmp,FALSE);
+ _tmp = _tmp.remove( mailDir ,true);
+ TQStringList subFList = TQStringList::split("/",_tmp,false);
for ( TQStringList::Iterator it = subFList.begin(); it != subFList.end(); ++it ) {
TQString _cat = *it;
if(!(_cat == *mailFile)) {
diff --git a/kmailcvt/filter_lnotes.cpp b/kmailcvt/filter_lnotes.cpp
index 7733c1c1..7c50f4c1 100644
--- a/kmailcvt/filter_lnotes.cpp
+++ b/kmailcvt/filter_lnotes.cpp
@@ -95,7 +95,7 @@ void FilterLNotes::ImportLNotes(const TQString& file) {
// Get folder name
TQFileInfo filenameInfo( file );
- TQString folder("LNotes-Import/" + filenameInfo.baseName(TRUE));
+ TQString folder("LNotes-Import/" + filenameInfo.baseName(true));
inf->setTo(folder);
// State machine to read the data in. The fgetc usage is probably terribly slow ...
diff --git a/kmailcvt/filter_mbox.cpp b/kmailcvt/filter_mbox.cpp
index c5f87e51..feb62a51 100644
--- a/kmailcvt/filter_mbox.cpp
+++ b/kmailcvt/filter_mbox.cpp
@@ -54,7 +54,7 @@ void FilterMBox::import(FilterInfo *info)
info->alert( i18n("Unable to open %1, skipping").arg( *filename ) );
} else {
TQFileInfo filenameInfo( *filename );
- TQString folderName( "MBOX-" + filenameInfo.baseName(TRUE) );
+ TQString folderName( "MBOX-" + filenameInfo.baseName(true) );
info->setCurrent(0);
info->addLog( i18n("Importing emails from %1...").arg( *filename ) );
diff --git a/kmailcvt/filter_oe.cpp b/kmailcvt/filter_oe.cpp
index 47002d96..476b09d2 100644
--- a/kmailcvt/filter_oe.cpp
+++ b/kmailcvt/filter_oe.cpp
@@ -126,7 +126,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName)
TQ_UINT32 sig_block1, sig_block2;
mailbox >> sig_block1 >> sig_block2;
if (sig_block1 == OE4_SIG_1 && sig_block2 == OE4_SIG_2) {
- folderName = "OE-Import/" + mailfileinfo.baseName(TRUE);
+ folderName = "OE-Import/" + mailfileinfo.baseName(true);
info->addLog(i18n("Importing OE4 Mailbox %1").arg( "../" + _nameOfFile));
info->setTo(folderName);
mbxImport(info, mailbox);
@@ -136,7 +136,7 @@ void FilterOE::importMailBox( FilterInfo *info, const TQString& fileName)
mailbox >> sig_block3 >> sig_block4;
if (sig_block1 == OE5_SIG_1 && sig_block3 == OE5_SIG_3 && sig_block4 == OE5_SIG_4) {
if (sig_block2 == OE5_EMAIL_SIG_2) {
- folderName = "OE-Import/" + mailfileinfo.baseName(TRUE);
+ folderName = "OE-Import/" + mailfileinfo.baseName(true);
if(parsedFolder) {
TQString _tmpFolder = getFolderName(_nameOfFile);
if(!_tmpFolder.isEmpty()) folderName = "OE-Import/" + _tmpFolder;
diff --git a/kmailcvt/filter_sylpheed.cpp b/kmailcvt/filter_sylpheed.cpp
index bf8427c2..9d8570e3 100644
--- a/kmailcvt/filter_sylpheed.cpp
+++ b/kmailcvt/filter_sylpheed.cpp
@@ -135,7 +135,7 @@ void FilterSylpheed::importFiles( FilterInfo *info, const TQString& dirName)
_path = "Sylpheed-Import/";
TQString _tmp = dir.filePath(*mailFile);
_tmp = _tmp.remove(_tmp.length() - _mfile.length() -1, _mfile.length()+1);
- _path += _tmp.remove( mailDir ,TRUE);
+ _path += _tmp.remove( mailDir ,true);
TQString _info = _path;
info->addLog(i18n("Import folder %1...").arg(_info.remove(0,15)));
diff --git a/kmailcvt/filter_thebat.cpp b/kmailcvt/filter_thebat.cpp
index a255f352..6a9642a1 100644
--- a/kmailcvt/filter_thebat.cpp
+++ b/kmailcvt/filter_thebat.cpp
@@ -194,7 +194,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName)
TQString _path = "TheBat-Import/";
TQString _tmp = FileName;
_tmp = _tmp.remove(_tmp.length() - 13, 13);
- _path += _tmp.remove( mailDir ,TRUE);
+ _path += _tmp.remove( mailDir ,true);
TQString _info = _path;
info->addLog(i18n("Import folder %1...").arg(_info.remove(0,14)));
info->setTo(_path);
diff --git a/kmailcvt/filter_thunderbird.cpp b/kmailcvt/filter_thunderbird.cpp
index e5f21d14..69aacca4 100644
--- a/kmailcvt/filter_thunderbird.cpp
+++ b/kmailcvt/filter_thunderbird.cpp
@@ -209,7 +209,7 @@ void FilterThunderbird::importMBox(FilterInfo *info, const TQString& mboxName, c
if(!targetDir.isNull()) {
if(_targetDir.contains(".sbd"))
_targetDir.remove(".sbd");
- destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(TRUE);// mboxName;
+ destFolder += "Thunderbird-Import/" + _targetDir + "/" + filenameInfo.baseName(true);// mboxName;
} else {
destFolder = "Thunderbird-Import/" + rootDir;
if(destFolder.contains(".sbd"))
diff --git a/kmailcvt/filters.cpp b/kmailcvt/filters.cpp
index 2c43ff43..0b5c9937 100644
--- a/kmailcvt/filters.cpp
+++ b/kmailcvt/filters.cpp
@@ -65,13 +65,13 @@ void FilterInfo::setTo( const TQString& to )
void FilterInfo::setCurrent( const TQString& current )
{
m_dlg->_current->setText( current );
- kapp->processEvents();
+ tdeApp->processEvents();
}
void FilterInfo::setCurrent( int percent )
{
m_dlg->_done_current->setProgress( percent );
- kapp->processEvents(); // Be careful - back & finish buttons disabled, so only user event that can happen is cancel/close button
+ tdeApp->processEvents(); // Be careful - back & finish buttons disabled, so only user event that can happen is cancel/close button
}
void FilterInfo::setOverall( int percent )
@@ -84,7 +84,7 @@ void FilterInfo::addLog( const TQString& log )
m_dlg->_log->insertItem( log );
m_dlg->_log->setCurrentItem( m_dlg->_log->count() - 1 );
m_dlg->_log->centerCurrentItem();
- kapp->processEvents();
+ tdeApp->processEvents();
}
void FilterInfo::clear()
@@ -135,7 +135,7 @@ bool Filter::addMessage( FilterInfo* info, const TQString& folderName,
KURL msgURL;
msgURL.setPath( msgPath );
- if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
+ if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) )
TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", folderName, msgURL, msgStatusFlags );
@@ -171,7 +171,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName
KURL msgURL;
msgURL.setPath( msgPath );
- if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
+ if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) )
TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage_fastImport", folderName, msgURL, msgStatusFlags );
@@ -199,7 +199,7 @@ bool Filter::addMessage_fastImport( FilterInfo* info, const TQString& folderName
void Filter::showKMailImportArchiveDialog( FilterInfo* info )
{
- if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
+ if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) )
TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "showImportArchiveDialog" );
diff --git a/kmailcvt/kimportpage.cpp b/kmailcvt/kimportpage.cpp
index 90da2e9c..bc6d784d 100644
--- a/kmailcvt/kimportpage.cpp
+++ b/kmailcvt/kimportpage.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include <tdeapplication.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqlabel.h>
#include "kimportpage.h"
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index 39ba423e..6ae6982d 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -40,7 +40,7 @@ KMailCVT::~KMailCVT() {
}
void KMailCVT::endImport() {
- if ( !kapp->dcopClient()->isApplicationRegistered( "kmail" ) )
+ if ( !tdeApp->dcopClient()->isApplicationRegistered( "kmail" ) )
TDEApplication::startServiceByDesktopName( "kmail", TQString() ); // Will wait until kmail is started
DCOPReply reply = DCOPRef( "kmail", "KMailIface" ).call( "dcopAddMessage", TQString(), TQString(), TQString());
diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp
index 118124f7..f121ff77 100644
--- a/kmailcvt/kselfilterpage.cpp
+++ b/kmailcvt/kselfilterpage.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqtextedit.h>
#include <tqcheckbox.h>
#include <tdelocale.h>
@@ -42,8 +42,8 @@
KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilterPageDlg(parent,name) {
mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png"));
- mFilterList.setAutoDelete( TRUE );
- connect(mFilterCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(filterSelected(int)));
+ mFilterList.setAutoDelete( true );
+ connect(mFilterCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(filterSelected(int)));
// Add new filters below. If this annoys you, please rewrite the stuff to use a factory.
// The former approach was overengineered and only worked around problems in the design