[Knode-devel] kdepim

[Volker Krause]

CVS commit by vkrause: 

- Add a parameter to KScoringManager to explicitly specify an app name so that it can find scorefiles for a plugin too.
- Make use of this in KNode.


  M +1 -1      knode/knmainwidget.cpp   1.15
  M +1 -1      knode/knscoring.cpp   1.17
  M +16 -6     libkdenetwork/kscoring.cpp   1.43
  M +3 -3      libkdenetwork/kscoring.h   1.22


--- kdepim/knode/knmainwidget.cpp  #1.14:1.15
@@ -976,5 +976,5 @@ void KNMainWidget::prepareShutdown()
   f_ilManager->prepareShutdown();
   a_ccManager->prepareShutdown();
-  s_coreManager->save();
+  s_coreManager->save("knode");
 }
 

--- kdepim/knode/knscoring.cpp  #1.16:1.17
@@ -92,5 +92,5 @@ KNScorableGroup::~KNScorableGroup()
 //----------------------------------------------------------------------------
 
-KNScoringManager::KNScoringManager()
+KNScoringManager::KNScoringManager() : KScoringManager("knode")
 {
 }

--- kdepim/libkdenetwork/kscoring.cpp  #1.42:1.43
@@ -736,10 +736,10 @@ bool KScoringRule::isExpired() const
 
 //----------------------------------------------------------------------------
-KScoringManager::KScoringManager()
+KScoringManager::KScoringManager(const QString& appName)
   :  cacheValid(false)//, _s(0)
 {
   allRules.setAutoDelete(true);
   // open the score file
-  load();
+  load(appName);
 }
 
@@ -749,8 +749,13 @@ KScoringManager::~KScoringManager()
 }
 
-void KScoringManager::load()
+void KScoringManager::load(const QString& appName)
 {
   QDomDocument sdoc("Scorefile");
-  QFile f( KGlobal::dirs()->saveLocation("appdata") + "/scorefile" );
+  QString filename;
+  if(appName.isNull())
+    filename = KGlobal::dirs()->saveLocation("appdata") + "/scorefile";
+  else
+    filename = KGlobal::dirs()->saveLocation("data") + "/" + appName + "/scorefile";
+  QFile f( filename );
   if ( !f.open( IO_ReadOnly ) )
     return;
@@ -768,8 +773,13 @@ void KScoringManager::load()
 }
 
-void KScoringManager::save()
+void KScoringManager::save(const QString& appName)
 {
   kdDebug(5100) << "KScoringManager::save() starts" << endl;
-  QFile f( KGlobal::dirs()->saveLocation("appdata") + "/scorefile" );
+  QString filename;
+  if(appName.isNull())
+    filename = KGlobal::dirs()->saveLocation("appdata") + "/scorefile";
+  else
+    filename = KGlobal::dirs()->saveLocation("data") + "/" + appName + "/scorefile";
+  QFile f( filename );
   if ( !f.open( IO_WriteOnly ) )
     return;

--- kdepim/libkdenetwork/kscoring.h  #1.21:1.22
@@ -294,5 +294,5 @@ class KScoringManager : public QObject
   typedef QPtrList<KScoringRule> ScoringRuleList;
 
-  KScoringManager();
+  KScoringManager(const QString& appName = QString::null);
   virtual ~KScoringManager();
 
@@ -347,6 +347,6 @@ class KScoringManager : public QObject
   void initCache(const QString& group/*, const QString& server*/);
 
-  void load();
-  void save();
+  void load(const QString& appName = QString::null);
+  void save(const QString& appName = QString::null);
 
   //--------------- Properties