[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdepim/gsoc=5Fpimimport=5D_pimimport=3A_pimimport?=
From:       Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date:       2011-07-12 12:39:02
Message-ID: 20110712123902.5F98EA60DD () git ! kde ! org
[Download RAW message or body]

Git commit 7beea58dd480951baeb3241ad816f33dc0767d95 by Christophe Giboudeaux, on \
behalf of Maciek Zarzycki. Committed on 02/07/2010 at 22:32.
Pushed by cgiboudeaux into branch 'gsoc_pimimport'.

pimimport: use QDir for path in AbstractDump

svn path=/branches/work/soc-pim/kdepim/; revision=1145408
(cherry picked from commit bf5e4c340cc35f91efeece6c059395ab5a8aa1a8)

M  +4    -6    pimimport/abstractdump.cpp     
M  +4    -4    pimimport/abstractdump.h     
M  +2    -2    pimimport/akonadidumper.cpp     
M  +1    -1    pimimport/akonadidumper.h     
M  +10   -8    pimimport/resourcedump.cpp     
M  +2    -2    pimimport/resourcedump.h     

http://commits.kde.org/kdepim/7beea58dd480951baeb3241ad816f33dc0767d95

diff --git a/pimimport/abstractdump.cpp b/pimimport/abstractdump.cpp
index c1e63b2..64159dd 100644
--- a/pimimport/abstractdump.cpp
+++ b/pimimport/abstractdump.cpp
@@ -3,12 +3,10 @@
 #include <QtCore/QDir>
 #include <kdebug.h>
 
-AbstractDump::AbstractDump( QString path, QObject *parent ) :
-    QObject(parent)
+AbstractDump::AbstractDump( const QDir &path, QObject *parent ) :
+    QObject( parent ), m_path( path )
 {
-  QDir dir(path);
-  m_path = dir.absolutePath();
-  if ( !dir.exists() )
+  if ( !m_path.exists() )
     kError() << "AbstractDump::AbstractDump(): path does not exist: " << m_path;
 }
 
@@ -16,7 +14,7 @@ AbstractDump::~AbstractDump()
 {
 }
 
-QString AbstractDump::path() const
+QDir AbstractDump::path() const
 {
   return m_path;
 }
diff --git a/pimimport/abstractdump.h b/pimimport/abstractdump.h
index e498073..5f981e3 100644
--- a/pimimport/abstractdump.h
+++ b/pimimport/abstractdump.h
@@ -2,7 +2,7 @@
 #define ABSTRACTDUMP_H
 
 #include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QtCore/QDir>
 
 /**
  Abstract base class for all dumps.
@@ -12,13 +12,13 @@ class AbstractDump : public QObject
   Q_OBJECT
 
   public:
-    AbstractDump( QString path, QObject *parent = 0 );
+    AbstractDump( const QDir &path, QObject *parent = 0 );
     virtual ~AbstractDump();
 
     /**
       Path to the dump.
       */
-    QString path() const;
+    QDir path() const;
 
     /** Enum specifying whether we are dumping or restoring. */
     enum Action {
@@ -38,7 +38,7 @@ class AbstractDump : public QObject
     void finished();
 
   private:
-    QString m_path; // path to the dump
+    QDir m_path; // path to the dump
 };
 
 #endif // ABSTRACTDUMP_H
diff --git a/pimimport/akonadidumper.cpp b/pimimport/akonadidumper.cpp
index f04adf7..a8a5d16 100644
--- a/pimimport/akonadidumper.cpp
+++ b/pimimport/akonadidumper.cpp
@@ -9,7 +9,7 @@
 
 using namespace Akonadi;
 
-AkonadiDump::AkonadiDump( QString path, QObject *parent ) :
+AkonadiDump::AkonadiDump( const QDir &path, QObject *parent ) :
     AbstractDump( path, parent ), m_remainingResources( 0 )
 {
 }
@@ -42,7 +42,7 @@ void AkonadiDump::initializeResources( AbstractDump::Action action \
)  AgentManager *mgr = AgentManager::self();
     foreach ( AgentInstance instance, mgr->instances() ) {
       // setup directory for resource
-      QString resPath = QString( "%1/%2" ).arg( path() ).arg( instance.identifier() \
); +      QString resPath = QString( "%1/%2" ).arg( path().absolutePath() ).arg( \
instance.identifier() );  QDir resDir;
       resDir.mkpath( resPath );
       resDir.setPath( resPath );
diff --git a/pimimport/akonadidumper.h b/pimimport/akonadidumper.h
index 58d2d47..3cca4a4 100644
--- a/pimimport/akonadidumper.h
+++ b/pimimport/akonadidumper.h
@@ -10,7 +10,7 @@ class AkonadiDump : public AbstractDump
   Q_OBJECT
 
 public:
-  explicit AkonadiDump( QString path, QObject *parent = 0 );
+  explicit AkonadiDump( const QDir &path, QObject *parent = 0 );
 
 public slots:
   virtual void dump();
diff --git a/pimimport/resourcedump.cpp b/pimimport/resourcedump.cpp
index d5bbbae..12fe933 100644
--- a/pimimport/resourcedump.cpp
+++ b/pimimport/resourcedump.cpp
@@ -9,16 +9,16 @@
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
-ResourceDump::ResourceDump( QString path, QObject *parent ) :
+ResourceDump::ResourceDump( const QDir &path, QObject *parent ) :
     AbstractDump( path, parent ), m_instance()
 {
-  m_name = path.split("/").last();
+  m_name = path.dirName();
 }
 
-ResourceDump::ResourceDump( QString path, Akonadi::AgentInstance instance, QObject \
*parent ) : +ResourceDump::ResourceDump( const QDir &path, Akonadi::AgentInstance \
instance, QObject *parent ) :  AbstractDump( path, parent ), m_instance( instance )
 {
-  m_name = path.split("/").last();
+  m_name = path.dirName();
 }
 
 Akonadi::AgentInstance ResourceDump::instance() const
@@ -39,7 +39,7 @@ void ResourceDump::dump()
   QString configPath = stdDirs.findResource( "config", QString( "%1rc" ).arg( \
m_instance.identifier() ) );  if ( !configPath.isEmpty() ) {
     QFile file( configPath );
-    QString configDest = QString( "%1/%2" ).arg( path() ).arg( "resourcerc" );
+    QString configDest = QString( "%1/%2" ).arg( path().absolutePath() ).arg( \
"resourcerc" );  if ( !file.copy( configDest ) ) {
       kError() << "ResourceDump::dump(): unable to copy file " << file.fileName()
           << " to " << configDest;
@@ -48,7 +48,8 @@ void ResourceDump::dump()
   }
 
   // write resourece type to info file
-  KConfig config( QString( "%1/%2" ).arg( path() ).arg( "resourceinfo" ), \
KConfig::SimpleConfig ); +  KConfig config( QString( "%1/%2" ).arg( \
path().absolutePath() ).arg( "resourceinfo" ), +                  \
KConfig::SimpleConfig );  KConfigGroup cfgGroup( &config, "General" );
   cfgGroup.writeEntry( "type", m_instance.type().identifier() );
   config.sync();
@@ -59,7 +60,8 @@ void ResourceDump::dump()
 void ResourceDump::restore()
 {
   // get resource type from info file
-  KConfig config( QString( "%1/%2" ).arg( path() ).arg( "resourceinfo" ), \
KConfig::SimpleConfig ); +  KConfig config( QString( "%1/%2" ).arg( \
path().absolutePath() ).arg( "resourceinfo" ), +                  \
KConfig::SimpleConfig );  KConfigGroup cfgGroup( &config, "General" );
   QString type = cfgGroup.readEntry( "type", QString() );
 
@@ -83,7 +85,7 @@ void ResourceDump::resourceCreated( KJob *job )
 void ResourceDump::restoreResource()
 {
   // copy resource's config file if there is one
-  QFile cfgFile( QString( "%1/%2" ).arg( path() ).arg( "resourcerc" ) );
+  QFile cfgFile( QString( "%1/%2" ).arg( path().absolutePath() ).arg( "resourcerc" ) \
);  if ( cfgFile.exists() ) {
     KStandardDirs dirs;
     QString configDir = dirs.saveLocation( "config" );
diff --git a/pimimport/resourcedump.h b/pimimport/resourcedump.h
index dd888c8..b5c379a 100644
--- a/pimimport/resourcedump.h
+++ b/pimimport/resourcedump.h
@@ -12,8 +12,8 @@ class ResourceDump : public AbstractDump
   Q_OBJECT
 
 public:
-  ResourceDump( QString path, QObject *parent = 0 );
-  ResourceDump( QString path, Akonadi::AgentInstance instance, QObject *parent = 0 \
); +  ResourceDump( const QDir &path, QObject *parent = 0 );
+  ResourceDump( const QDir &path, Akonadi::AgentInstance instance, QObject *parent = \
0 );  
   Akonadi::AgentInstance instance() const;
 


[prev in list] [next in list] [prev in thread] [next in thread]