[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] /: Rename function to defaultSettingsPath
From: Montel Laurent <montel () kde ! org>
Date: 2012-08-31 20:24:16
Message-ID: 20120831202416.8A394A60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 3f10a925bfeeff2d57070d0581a6d80e8d86df61 by Montel Laurent.
Committed on 31/08/2012 at 17:44.
Pushed by mlaurent into branch 'master'.
Rename function to defaultSettingsPath
M +1 -1 importwizard/claws-mail/clawsmailimportdata.cpp
M +1 -1 importwizard/evolutionv1/evolutionv1importdata.cpp
M +1 -1 importwizard/evolutionv2/evolutionv2importdata.cpp
M +1 -1 importwizard/evolutionv3/evolutionv3importdata.cpp
M +1 -1 importwizard/opera/operaimportdata.cpp
M +1 -1 importwizard/opera/operasettings.cpp
M +1 -1 importwizard/sylpheed/sylpheedimportdata.cpp
M +1 -1 importwizard/thunderbird/thunderbirdimportdata.cpp
M +1 -1 mailcommon/filter/filterimporter/filterimporterbalsa.cpp
M +1 -1 mailcommon/filter/filterimporter/filterimporterbalsa_p.h
M +1 -1 mailcommon/filter/filterimporter/filterimporterclawsmail.cpp
M +1 -1 mailcommon/filter/filterimporter/filterimporterclawsmail_p.h
M +1 -1 mailcommon/filter/filterimporter/filterimporterevolution.cpp
M +1 -1 mailcommon/filter/filterimporter/filterimporterevolution_p.h
M +1 -1 mailcommon/filter/filterimporter/filterimporterprocmail.cpp
M +1 -1 mailcommon/filter/filterimporter/filterimporterprocmail_p.h
M +1 -1 mailcommon/filter/filterimporter/filterimportersylpheed.cpp
M +1 -1 mailcommon/filter/filterimporter/filterimportersylpheed_p.h
M +1 -1 mailcommon/filter/filterimporter/filterimporterthunderbird.cpp
M +1 -1 mailcommon/filter/filterimporter/filterimporterthunderbird_p.h
M +7 -7 mailcommon/filter/filterimporterexporter.cpp
M +1 -1 mailcommon/filter/selectthunderbirdfilterfileswidget.cpp
M +2 -2 mailimporter/filter_clawsmail.cpp
M +1 -1 mailimporter/filter_clawsmail.h
M +2 -2 mailimporter/filter_evolution.cpp
M +1 -1 mailimporter/filter_evolution.h
M +2 -2 mailimporter/filter_evolution_v2.cpp
M +1 -1 mailimporter/filter_evolution_v2.h
M +2 -2 mailimporter/filter_evolution_v3.cpp
M +1 -1 mailimporter/filter_evolution_v3.h
M +2 -2 mailimporter/filter_opera.cpp
M +1 -1 mailimporter/filter_opera.h
M +2 -2 mailimporter/filter_sylpheed.cpp
M +1 -1 mailimporter/filter_sylpheed.h
M +3 -3 mailimporter/filter_thunderbird.cpp
M +1 -1 mailimporter/filter_thunderbird.h
M +2 -2 mailimporter/filterbalsa.cpp
M +1 -1 mailimporter/filterbalsa.h
http://commits.kde.org/kdepim/3f10a925bfeeff2d57070d0581a6d80e8d86df61
diff --git a/importwizard/claws-mail/clawsmailimportdata.cpp \
b/importwizard/claws-mail/clawsmailimportdata.cpp index d510122..7f9f0cd 100644
--- a/importwizard/claws-mail/clawsmailimportdata.cpp
+++ b/importwizard/claws-mail/clawsmailimportdata.cpp
@@ -33,7 +33,7 @@
ClawsMailImportData::ClawsMailImportData(ImportWizard*parent)
:AbstractImporter(parent)
{
- mPath = MailImporter::FilterClawsMail::defaultPath();
+ mPath = MailImporter::FilterClawsMail::defaultSettingsPath();
}
ClawsMailImportData::~ClawsMailImportData()
diff --git a/importwizard/evolutionv1/evolutionv1importdata.cpp \
b/importwizard/evolutionv1/evolutionv1importdata.cpp index 2f94801..53ef79e 100644
--- a/importwizard/evolutionv1/evolutionv1importdata.cpp
+++ b/importwizard/evolutionv1/evolutionv1importdata.cpp
@@ -29,7 +29,7 @@
Evolutionv1ImportData::Evolutionv1ImportData(ImportWizard *parent)
:AbstractImporter(parent)
{
- mPath = MailImporter::FilterEvolution::defaultPath();
+ mPath = MailImporter::FilterEvolution::defaultSettingsPath();
}
Evolutionv1ImportData::~Evolutionv1ImportData()
diff --git a/importwizard/evolutionv2/evolutionv2importdata.cpp \
b/importwizard/evolutionv2/evolutionv2importdata.cpp index 07a98c5..e909a24 100644
--- a/importwizard/evolutionv2/evolutionv2importdata.cpp
+++ b/importwizard/evolutionv2/evolutionv2importdata.cpp
@@ -29,7 +29,7 @@
Evolutionv2ImportData::Evolutionv2ImportData(ImportWizard*parent)
:AbstractImporter(parent)
{
- mPath = MailImporter::FilterEvolution_v2::defaultPath();
+ mPath = MailImporter::FilterEvolution_v2::defaultSettingsPath();
}
Evolutionv2ImportData::~Evolutionv2ImportData()
diff --git a/importwizard/evolutionv3/evolutionv3importdata.cpp \
b/importwizard/evolutionv3/evolutionv3importdata.cpp index 74f96f8..d50cfe0 100644
--- a/importwizard/evolutionv3/evolutionv3importdata.cpp
+++ b/importwizard/evolutionv3/evolutionv3importdata.cpp
@@ -35,7 +35,7 @@
Evolutionv3ImportData::Evolutionv3ImportData(ImportWizard*parent)
:AbstractImporter(parent)
{
- mPath = MailImporter::FilterEvolution_v3::defaultPath();
+ mPath = MailImporter::FilterEvolution_v3::defaultSettingsPath();
}
Evolutionv3ImportData::~Evolutionv3ImportData()
diff --git a/importwizard/opera/operaimportdata.cpp \
b/importwizard/opera/operaimportdata.cpp index ecb7193..45a9e32 100644
--- a/importwizard/opera/operaimportdata.cpp
+++ b/importwizard/opera/operaimportdata.cpp
@@ -32,7 +32,7 @@
OperaImportData::OperaImportData(ImportWizard*parent)
:AbstractImporter(parent)
{
- mPath = MailImporter::FilterOpera::defaultPath();
+ mPath = MailImporter::FilterOpera::defaultSettingsPath();
}
OperaImportData::~OperaImportData()
diff --git a/importwizard/opera/operasettings.cpp \
b/importwizard/opera/operasettings.cpp index 0b05b37..8971eb2 100644
--- a/importwizard/opera/operasettings.cpp
+++ b/importwizard/opera/operasettings.cpp
@@ -246,7 +246,7 @@ void OperaSettings::readIdentity(const KConfigGroup &grp)
KPIMIdentities::Signature signature;
const int signatureHtml = grp.readEntry(QLatin1String("Signature is \
HTML"),-1); if(signatureFile.contains(QLatin1String("{Preferences}"))) {
- signatureFile.replace(QLatin1String("{Preferences}"),MailImporter::FilterOpera::defaultPath()+QLatin1String("/"));
+ signatureFile.replace(QLatin1String("{Preferences}"),MailImporter::FilterOpera::defaultSettingsPath()+QLatin1String("/"));
}
QFile file(signatureFile);
diff --git a/importwizard/sylpheed/sylpheedimportdata.cpp \
b/importwizard/sylpheed/sylpheedimportdata.cpp index c658377..fd98bce 100644
--- a/importwizard/sylpheed/sylpheedimportdata.cpp
+++ b/importwizard/sylpheed/sylpheedimportdata.cpp
@@ -33,7 +33,7 @@
SylpheedImportData::SylpheedImportData(ImportWizard*parent)
:AbstractImporter(parent)
{
- mPath = MailImporter::FilterSylpheed::defaultPath();
+ mPath = MailImporter::FilterSylpheed::defaultSettingsPath();
}
SylpheedImportData::~SylpheedImportData()
diff --git a/importwizard/thunderbird/thunderbirdimportdata.cpp \
b/importwizard/thunderbird/thunderbirdimportdata.cpp index 5876828..5d576e4 100644
--- a/importwizard/thunderbird/thunderbirdimportdata.cpp
+++ b/importwizard/thunderbird/thunderbirdimportdata.cpp
@@ -38,7 +38,7 @@
ThunderbirdImportData::ThunderbirdImportData(ImportWizard*parent)
:AbstractImporter(parent)
{
- mPath = MailImporter::FilterThunderbird::defaultPath();
+ mPath = MailImporter::FilterThunderbird::defaultSettingsPath();
}
ThunderbirdImportData::~ThunderbirdImportData()
diff --git a/mailcommon/filter/filterimporter/filterimporterbalsa.cpp \
b/mailcommon/filter/filterimporter/filterimporterbalsa.cpp index 53e192e..c34bf3f \
100644
--- a/mailcommon/filter/filterimporter/filterimporterbalsa.cpp
+++ b/mailcommon/filter/filterimporter/filterimporterbalsa.cpp
@@ -43,7 +43,7 @@ FilterImporterBalsa::~FilterImporterBalsa()
{
}
-QString FilterImporterBalsa::defaultPath()
+QString FilterImporterBalsa::defaultFiltersSettingsPath()
{
return QString::fromLatin1( "%1/.balsa/config" ).arg( QDir::homePath() );
}
diff --git a/mailcommon/filter/filterimporter/filterimporterbalsa_p.h \
b/mailcommon/filter/filterimporter/filterimporterbalsa_p.h index 9faf52e..563be3e \
100644
--- a/mailcommon/filter/filterimporter/filterimporterbalsa_p.h
+++ b/mailcommon/filter/filterimporter/filterimporterbalsa_p.h
@@ -34,7 +34,7 @@ class FilterImporterBalsa : public FilterImporterAbstract
public:
explicit FilterImporterBalsa( QFile *file );
~FilterImporterBalsa();
- static QString defaultPath();
+ static QString defaultFiltersSettingsPath();
private:
void addFilter(const KConfigGroup &grp);
void parseCondition(const QString& condition,MailCommon::MailFilter *filter );
diff --git a/mailcommon/filter/filterimporter/filterimporterclawsmail.cpp \
b/mailcommon/filter/filterimporter/filterimporterclawsmail.cpp index 83fb3bc..785d0cb \
100644
--- a/mailcommon/filter/filterimporter/filterimporterclawsmail.cpp
+++ b/mailcommon/filter/filterimporter/filterimporterclawsmail.cpp
@@ -45,7 +45,7 @@ FilterImporterClawsMails::~FilterImporterClawsMails()
{
}
-QString FilterImporterClawsMails::defaultPath()
+QString FilterImporterClawsMails::defaultFiltersSettingsPath()
{
return QString::fromLatin1( "%1/.claws-mail/matcherrc" ).arg( QDir::homePath() );
}
diff --git a/mailcommon/filter/filterimporter/filterimporterclawsmail_p.h \
b/mailcommon/filter/filterimporter/filterimporterclawsmail_p.h index eb4921a..11b7b85 \
100644
--- a/mailcommon/filter/filterimporter/filterimporterclawsmail_p.h
+++ b/mailcommon/filter/filterimporter/filterimporterclawsmail_p.h
@@ -34,7 +34,7 @@ class FilterImporterClawsMails : public FilterImporterAbstract
public:
explicit FilterImporterClawsMails( QFile *file );
~FilterImporterClawsMails();
- static QString defaultPath();
+ static QString defaultFiltersSettingsPath();
};
}
diff --git a/mailcommon/filter/filterimporter/filterimporterevolution.cpp \
b/mailcommon/filter/filterimporter/filterimporterevolution.cpp index 7d61f22..8f69097 \
100644
--- a/mailcommon/filter/filterimporter/filterimporterevolution.cpp
+++ b/mailcommon/filter/filterimporter/filterimporterevolution.cpp
@@ -54,7 +54,7 @@ FilterImporterEvolution::~FilterImporterEvolution()
{
}
-QString FilterImporterEvolution::defaultPath()
+QString FilterImporterEvolution::defaultFiltersSettingsPath()
{
return QString::fromLatin1( "%1/.config/evolution/mail/filters.xml" ).arg( \
QDir::homePath() ); }
diff --git a/mailcommon/filter/filterimporter/filterimporterevolution_p.h \
b/mailcommon/filter/filterimporter/filterimporterevolution_p.h index c733773..5bd7d85 \
100644
--- a/mailcommon/filter/filterimporter/filterimporterevolution_p.h
+++ b/mailcommon/filter/filterimporter/filterimporterevolution_p.h
@@ -33,7 +33,7 @@ class FilterImporterEvolution : public FilterImporterAbstract
public:
explicit FilterImporterEvolution( QFile *file );
~FilterImporterEvolution();
- static QString defaultPath();
+ static QString defaultFiltersSettingsPath();
private:
enum parseType {
PartType = 0,
diff --git a/mailcommon/filter/filterimporter/filterimporterprocmail.cpp \
b/mailcommon/filter/filterimporter/filterimporterprocmail.cpp index ea23216..68be360 \
100644
--- a/mailcommon/filter/filterimporter/filterimporterprocmail.cpp
+++ b/mailcommon/filter/filterimporter/filterimporterprocmail.cpp
@@ -44,7 +44,7 @@ FilterImporterProcmail::~FilterImporterProcmail()
{
}
-QString FilterImporterProcmail::defaultPath()
+QString FilterImporterProcmail::defaultFiltersSettingsPath()
{
return QDir::homePath();
}
diff --git a/mailcommon/filter/filterimporter/filterimporterprocmail_p.h \
b/mailcommon/filter/filterimporter/filterimporterprocmail_p.h index e67bf09..7a278b2 \
100644
--- a/mailcommon/filter/filterimporter/filterimporterprocmail_p.h
+++ b/mailcommon/filter/filterimporter/filterimporterprocmail_p.h
@@ -33,7 +33,7 @@ class FilterImporterProcmail : public FilterImporterAbstract
public:
explicit FilterImporterProcmail( QFile *file );
~FilterImporterProcmail();
- static QString defaultPath();
+ static QString defaultFiltersSettingsPath();
private:
MailCommon::MailFilter *parseLine( QTextStream &stream, QString line, \
MailCommon::MailFilter *filter );
diff --git a/mailcommon/filter/filterimporter/filterimportersylpheed.cpp \
b/mailcommon/filter/filterimporter/filterimportersylpheed.cpp index 0e1eb41..13f624d \
100644
--- a/mailcommon/filter/filterimporter/filterimportersylpheed.cpp
+++ b/mailcommon/filter/filterimporter/filterimportersylpheed.cpp
@@ -53,7 +53,7 @@ FilterImporterSylpheed::~FilterImporterSylpheed()
{
}
-QString FilterImporterSylpheed::defaultPath()
+QString FilterImporterSylpheed::defaultFiltersSettingsPath()
{
return QString::fromLatin1( "%1/.sylpheed-2.0/filter.xml" ).arg( QDir::homePath() \
); }
diff --git a/mailcommon/filter/filterimporter/filterimportersylpheed_p.h \
b/mailcommon/filter/filterimporter/filterimportersylpheed_p.h index a17a0a6..f56d641 \
100644
--- a/mailcommon/filter/filterimporter/filterimportersylpheed_p.h
+++ b/mailcommon/filter/filterimporter/filterimportersylpheed_p.h
@@ -33,7 +33,7 @@ class FilterImporterSylpheed : public FilterImporterAbstract
public:
explicit FilterImporterSylpheed( QFile *file );
~FilterImporterSylpheed();
- static QString defaultPath();
+ static QString defaultFiltersSettingsPath();
private:
void parseFilters( const QDomElement &e );
void parseConditions( const QDomElement &ruleFilter, MailCommon::MailFilter \
*filter );
diff --git a/mailcommon/filter/filterimporter/filterimporterthunderbird.cpp \
b/mailcommon/filter/filterimporter/filterimporterthunderbird.cpp index \
eef31fc..c0105a9 100644
--- a/mailcommon/filter/filterimporter/filterimporterthunderbird.cpp
+++ b/mailcommon/filter/filterimporter/filterimporterthunderbird.cpp
@@ -42,7 +42,7 @@ FilterImporterThunderbird::~FilterImporterThunderbird()
{
}
-QString FilterImporterThunderbird::defaultPath()
+QString FilterImporterThunderbird::defaultFiltersSettingsPath()
{
return QString::fromLatin1( "%1/.thunderbird/" ).arg( QDir::homePath() );
}
diff --git a/mailcommon/filter/filterimporter/filterimporterthunderbird_p.h \
b/mailcommon/filter/filterimporter/filterimporterthunderbird_p.h index \
8e0883f..e5ca521 100644
--- a/mailcommon/filter/filterimporter/filterimporterthunderbird_p.h
+++ b/mailcommon/filter/filterimporter/filterimporterthunderbird_p.h
@@ -32,7 +32,7 @@ class FilterImporterThunderbird : public FilterImporterAbstract
public:
explicit FilterImporterThunderbird( QFile *file );
~FilterImporterThunderbird();
- static QString defaultPath();
+ static QString defaultFiltersSettingsPath();
private:
static QString cleanArgument( const QString &line, const QString &removeStr );
void extractConditions( const QString &line, MailCommon::MailFilter *filter );
diff --git a/mailcommon/filter/filterimporterexporter.cpp \
b/mailcommon/filter/filterimporterexporter.cpp index 14f816f..ad90e7c 100644
--- a/mailcommon/filter/filterimporterexporter.cpp
+++ b/mailcommon/filter/filterimporterexporter.cpp
@@ -276,27 +276,27 @@ QList<MailFilter *> FilterImporterExporter::importFilters(
break;
case ThunderBirdFilter:
title = i18n( "Import Thunderbird Filters" );
- defaultPath = MailCommon::FilterImporterThunderbird::defaultPath();
+ defaultPath = \
MailCommon::FilterImporterThunderbird::defaultFiltersSettingsPath(); break;
case EvolutionFilter:
title = i18n( "Import Evolution Filters" );
- defaultPath = MailCommon::FilterImporterEvolution::defaultPath();
+ defaultPath = \
MailCommon::FilterImporterEvolution::defaultFiltersSettingsPath(); break;
case SylpheedFilter:
title = i18n( "Import Sylpheed Filters" );
- defaultPath = MailCommon::FilterImporterSylpheed::defaultPath();
+ defaultPath = \
MailCommon::FilterImporterSylpheed::defaultFiltersSettingsPath(); break;
case ProcmailFilter:
title = i18n( "Import Procmail Filters" );
- defaultPath = MailCommon::FilterImporterProcmail::defaultPath();
+ defaultPath = \
MailCommon::FilterImporterProcmail::defaultFiltersSettingsPath(); break;
case BalsaFilter:
title = i18n( "Import Balsa Filters" );
- defaultPath = MailCommon::FilterImporterBalsa::defaultPath();
+ defaultPath = MailCommon::FilterImporterBalsa::defaultFiltersSettingsPath();
break;
case ClawsMailFilter:
title = i18n( "Import Claws Mail Filters" );
- defaultPath = MailCommon::FilterImporterClawsMails::defaultPath();
+ defaultPath = \
MailCommon::FilterImporterClawsMails::defaultFiltersSettingsPath(); break;
}
@@ -331,7 +331,7 @@ QList<MailFilter *> FilterImporterExporter::importFilters(
{
if(fileName.isEmpty()) {
SelectThunderbirdFilterFilesDialog * selectThunderBirdFileDialog = new \
SelectThunderbirdFilterFilesDialog(d->mParent);
- selectThunderBirdFileDialog->setStartDir(KUrl(MailCommon::FilterImporterThunderbird::defaultPath()));
+ selectThunderBirdFileDialog->setStartDir(KUrl(MailCommon::FilterImporterThunderbird::defaultFiltersSettingsPath()));
if(selectThunderBirdFileDialog->exec()) {
Q_FOREACH(const QString& url, selectThunderBirdFileDialog->selectedFiles()) \
{ QFile fileThunderbird(url);
diff --git a/mailcommon/filter/selectthunderbirdfilterfileswidget.cpp \
b/mailcommon/filter/selectthunderbirdfilterfileswidget.cpp index df52d36..0b7356d \
100644
--- a/mailcommon/filter/selectthunderbirdfilterfileswidget.cpp
+++ b/mailcommon/filter/selectthunderbirdfilterfileswidget.cpp
@@ -73,7 +73,7 @@ void SelectThunderbirdFilterFilesWidget::slotProfileChanged(int \
index) }
QStringList listFilterFiles;
- const QString path(MailImporter::FilterThunderbird::defaultPath() + \
ui->profiles->itemData(index).toString()); + const QString \
path(MailImporter::FilterThunderbird::defaultSettingsPath() + \
ui->profiles->itemData(index).toString()); QDir dir(path);
const QStringList subDir = \
dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot,QDir::Name); Q_FOREACH( const \
QString& mailPath, subDir ) {
diff --git a/mailimporter/filter_clawsmail.cpp b/mailimporter/filter_clawsmail.cpp
index a0ac66d..3c02a2b 100644
--- a/mailimporter/filter_clawsmail.cpp
+++ b/mailimporter/filter_clawsmail.cpp
@@ -45,14 +45,14 @@ FilterClawsMail::~FilterClawsMail()
{
}
-QString FilterClawsMail::defaultPath()
+QString FilterClawsMail::defaultSettingsPath()
{
return QDir::homePath() + QLatin1String( "/.claws-mail/" );
}
QString FilterClawsMail::localMailDirPath()
{
- QFile folderListFile( defaultPath() + QLatin1String( "/folderlist.xml" ) );
+ QFile folderListFile( defaultSettingsPath() + QLatin1String( "/folderlist.xml" ) \
); if ( folderListFile.exists() ) {
QDomDocument doc;
QString errorMsg;
diff --git a/mailimporter/filter_clawsmail.h b/mailimporter/filter_clawsmail.h
index 59e06e9..52533e9 100644
--- a/mailimporter/filter_clawsmail.h
+++ b/mailimporter/filter_clawsmail.h
@@ -33,7 +33,7 @@ public:
explicit FilterClawsMail();
~FilterClawsMail();
- static QString defaultPath();
+ static QString defaultSettingsPath();
void import();
void importMails( const QString& maildir );
diff --git a/mailimporter/filter_evolution.cpp b/mailimporter/filter_evolution.cpp
index c2117bc..11cbb3b 100644
--- a/mailimporter/filter_evolution.cpp
+++ b/mailimporter/filter_evolution.cpp
@@ -41,7 +41,7 @@ FilterEvolution::~FilterEvolution()
{
}
-QString FilterEvolution::defaultPath()
+QString FilterEvolution::defaultSettingsPath()
{
return QDir::homePath() + QLatin1String( "/evolution/local" );
}
@@ -50,7 +50,7 @@ QString FilterEvolution::defaultPath()
void FilterEvolution::import()
{
// We ask the user to choose Evolution's root directory.
- QString evolDir = defaultPath();
+ QString evolDir = defaultSettingsPath();
QDir d( evolDir );
if ( !d.exists() ) {
evolDir = QDir::homePath();
diff --git a/mailimporter/filter_evolution.h b/mailimporter/filter_evolution.h
index 42b9470..db5354d 100644
--- a/mailimporter/filter_evolution.h
+++ b/mailimporter/filter_evolution.h
@@ -35,7 +35,7 @@ public:
void import();
void importMails( const QString& maildir );
- static QString defaultPath();
+ static QString defaultSettingsPath();
private:
void importDirContents(const QString&, const QString&, const QString&);
void importMBox(const QString&, const QString&, const QString&);
diff --git a/mailimporter/filter_evolution_v2.cpp \
b/mailimporter/filter_evolution_v2.cpp index 5531d58..ad7b92e 100644
--- a/mailimporter/filter_evolution_v2.cpp
+++ b/mailimporter/filter_evolution_v2.cpp
@@ -42,7 +42,7 @@ FilterEvolution_v2::~FilterEvolution_v2()
}
-QString FilterEvolution_v2::defaultPath()
+QString FilterEvolution_v2::defaultSettingsPath()
{
return QDir::homePath() + QLatin1String( "/.evolution/mail/local" );
}
@@ -55,7 +55,7 @@ void FilterEvolution_v2::import()
* We ask the user to choose Evolution's root directory.
* This should be usually ~/.evolution/mail/local/
*/
- QString evolDir = defaultPath();
+ QString evolDir = defaultSettingsPath();
QDir d( evolDir );
if ( !d.exists() ) {
evolDir = QDir::homePath();
diff --git a/mailimporter/filter_evolution_v2.h b/mailimporter/filter_evolution_v2.h
index dff8ef9..bc85f5e 100644
--- a/mailimporter/filter_evolution_v2.h
+++ b/mailimporter/filter_evolution_v2.h
@@ -33,7 +33,7 @@ public:
void import();
void importMails( const QString& maildir );
- static QString defaultPath();
+ static QString defaultSettingsPath();
private:
void importDirContents(const QString&, const QString&, const QString&);
diff --git a/mailimporter/filter_evolution_v3.cpp \
b/mailimporter/filter_evolution_v3.cpp index 7976662..48e72ba 100644
--- a/mailimporter/filter_evolution_v3.cpp
+++ b/mailimporter/filter_evolution_v3.cpp
@@ -40,7 +40,7 @@ FilterEvolution_v3::~FilterEvolution_v3()
{
}
-QString FilterEvolution_v3::defaultPath()
+QString FilterEvolution_v3::defaultSettingsPath()
{
return QDir::homePath() + QLatin1String( "/.local/share/evolution/mail/local/" );
}
@@ -50,7 +50,7 @@ QString FilterEvolution_v3::defaultPath()
void FilterEvolution_v3::import()
{
setCountDuplicates(0);
- QString evolDir = defaultPath();
+ QString evolDir = defaultSettingsPath();
QDir d( evolDir );
if ( !d.exists() ) {
evolDir = QDir::homePath();
diff --git a/mailimporter/filter_evolution_v3.h b/mailimporter/filter_evolution_v3.h
index 4b1fb5e..c66f276 100644
--- a/mailimporter/filter_evolution_v3.h
+++ b/mailimporter/filter_evolution_v3.h
@@ -29,7 +29,7 @@ public:
void import();
void importMails( const QString& maildir );
- static QString defaultPath();
+ static QString defaultSettingsPath();
private:
void importDirContents(const QString&);
diff --git a/mailimporter/filter_opera.cpp b/mailimporter/filter_opera.cpp
index 5c3365e..8c6d892 100644
--- a/mailimporter/filter_opera.cpp
+++ b/mailimporter/filter_opera.cpp
@@ -40,7 +40,7 @@ FilterOpera::~FilterOpera()
{
}
-QString FilterOpera::defaultPath()
+QString FilterOpera::defaultSettingsPath()
{
return QDir::homePath() + QLatin1String("/.opera/");
}
@@ -151,7 +151,7 @@ void FilterOpera::importBox(const QDir& importDir, const \
QStringList &files, con void FilterOpera::import()
{
/** try to go to opera mailfolder in the home of the user */
- QString startdir = defaultPath() + QLatin1String("mail/store/");
+ QString startdir = defaultSettingsPath() + QLatin1String("mail/store/");
QDir d( startdir );
if ( !d.exists() ) {
startdir = QDir::homePath();
diff --git a/mailimporter/filter_opera.h b/mailimporter/filter_opera.h
index 41b204d..032c1b1 100644
--- a/mailimporter/filter_opera.h
+++ b/mailimporter/filter_opera.h
@@ -33,7 +33,7 @@ public:
void import();
void importMails( const QString &maildir );
- static QString defaultPath();
+ static QString defaultSettingsPath();
private:
void importBox( const QDir & importDir, const QStringList & , const QString & \
accountName = QString());
diff --git a/mailimporter/filter_sylpheed.cpp b/mailimporter/filter_sylpheed.cpp
index 4af50a5..43d815b 100644
--- a/mailimporter/filter_sylpheed.cpp
+++ b/mailimporter/filter_sylpheed.cpp
@@ -44,14 +44,14 @@ FilterSylpheed::~FilterSylpheed()
{
}
-QString FilterSylpheed::defaultPath()
+QString FilterSylpheed::defaultSettingsPath()
{
return QDir::homePath() + QLatin1String( "/.sylpheed-2.0/" );
}
QString FilterSylpheed::localMailDirPath()
{
- QFile folderListFile( defaultPath() + QLatin1String( "/folderlist.xml" ) );
+ QFile folderListFile( defaultSettingsPath() + QLatin1String( "/folderlist.xml" ) \
); if ( folderListFile.exists() ) {
QDomDocument doc;
QString errorMsg;
diff --git a/mailimporter/filter_sylpheed.h b/mailimporter/filter_sylpheed.h
index a58abc7..aa3bb36 100644
--- a/mailimporter/filter_sylpheed.h
+++ b/mailimporter/filter_sylpheed.h
@@ -34,7 +34,7 @@ public:
explicit FilterSylpheed();
~FilterSylpheed();
- static QString defaultPath();
+ static QString defaultSettingsPath();
void import();
void importMails( const QString& maildir );
diff --git a/mailimporter/filter_thunderbird.cpp \
b/mailimporter/filter_thunderbird.cpp index be080f5..7c082ed 100644
--- a/mailimporter/filter_thunderbird.cpp
+++ b/mailimporter/filter_thunderbird.cpp
@@ -45,7 +45,7 @@ FilterThunderbird::~FilterThunderbird()
}
-QString FilterThunderbird::defaultPath()
+QString FilterThunderbird::defaultSettingsPath()
{
return QDir::homePath() + QLatin1String( "/.thunderbird/" );
}
@@ -71,7 +71,7 @@ QString FilterThunderbird::defaultProfile(QWidget * parent)
QMap<QString,QString> FilterThunderbird::listProfile(QString¤tProfile)
{
- const QString thunderbirdPath = defaultPath() + QLatin1String( "/profiles.ini" );
+ const QString thunderbirdPath = defaultSettingsPath() + QLatin1String( \
"/profiles.ini" ); QMap<QString,QString> lstProfile;
QFile profiles( thunderbirdPath );
if ( profiles.exists() ) {
@@ -111,7 +111,7 @@ void FilterThunderbird::import()
* We ask the user to choose Thunderbird's root directory.
* This should be usually ~/.thunderbird/xxxx.default/Mail/Local Folders/
*/
- QString thunderDir = defaultPath();
+ QString thunderDir = defaultSettingsPath();
QDir d( thunderDir );
if ( !d.exists() ) {
thunderDir = QDir::homePath();
diff --git a/mailimporter/filter_thunderbird.h b/mailimporter/filter_thunderbird.h
index 0f59f0f..e5dd87a 100644
--- a/mailimporter/filter_thunderbird.h
+++ b/mailimporter/filter_thunderbird.h
@@ -35,7 +35,7 @@ public:
void import();
void importMails( const QString & maildir );
- static QString defaultPath();
+ static QString defaultSettingsPath();
static QString defaultProfile(QWidget *parent = 0);
static QMap<QString, QString> listProfile(QString¤tProfile);
diff --git a/mailimporter/filterbalsa.cpp b/mailimporter/filterbalsa.cpp
index d403cba..31937ae 100644
--- a/mailimporter/filterbalsa.cpp
+++ b/mailimporter/filterbalsa.cpp
@@ -38,7 +38,7 @@ FilterBalsa::~FilterBalsa()
{
}
-QString FilterBalsa::defaultPath()
+QString FilterBalsa::defaultSettingsPath()
{
return QDir::homePath() + QLatin1String( "/mail/" );
}
@@ -48,7 +48,7 @@ QString FilterBalsa::defaultPath()
void FilterBalsa::import()
{
setCountDuplicates(0);
- QString balsaDir = defaultPath();
+ QString balsaDir = defaultSettingsPath();
QDir d( balsaDir );
if ( !d.exists() ) {
balsaDir = QDir::homePath();
diff --git a/mailimporter/filterbalsa.h b/mailimporter/filterbalsa.h
index 9b195d1..cd252e1 100644
--- a/mailimporter/filterbalsa.h
+++ b/mailimporter/filterbalsa.h
@@ -29,7 +29,7 @@ public:
void import();
void importMails( const QString& maildir );
- static QString defaultPath();
+ static QString defaultSettingsPath();
private:
void importDirContents(const QString&);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic