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

List:       kde-commits
Subject:    playground/pim/akonaditest
From:       Kevin Krammer <kevin.krammer () gmx ! at>
Date:       2008-08-30 20:33:53
Message-ID: 1220128433.520764.5083.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 854965 by krake:

We also need to make KDEHOME configurable


 M  +11 -0     config.cpp  
 M  +5 -2      config.h  
 M  +1 -0      config.xml  
 M  +3 -1      configreader.cpp  
 M  +2 -0      setup.cpp  


--- trunk/playground/pim/akonaditest/config.cpp #854964:854965
@@ -40,6 +40,11 @@
   delete instance;
 }
 
+QString Config::getKdeHome() const
+{
+  return kdehome;
+}
+
 QString Config::getXdgDataHome() const
 {
   return xdgdatahome;
@@ -50,6 +55,12 @@
   return xdgconfighome;
 }
 
+void Config::setKdeHome(const QString &home)
+{
+  QDir kdeHomeDir( home );
+  kdehome = kdeHomeDir.absolutePath();
+}
+
 void Config::setXdgDataHome(const QString &datahome)
 {
   QDir dataHomeDir( datahome );
--- trunk/playground/pim/akonaditest/config.h #854964:854965
@@ -24,20 +24,23 @@
 class Config
 {
   private:
+    QString kdehome;
     QString xdgdatahome;
     QString xdgconfighome;
     QList <QPair<QString, QString> > itemconfig; //fix it
     static Config *instance;
-	
+
   public:
     static Config *getInstance();
     static void destroyInstance();
+    QString getKdeHome() const;
     QString getXdgDataHome() const;
     QString getXdgConfigHome() const;
     QList<QPair<QString, QString> > getItemConfig();
- 
+
   protected:
     Config();
+    void setKdeHome(const QString &home);
     void setXdgDataHome(const QString &datahome);
     void setXdgConfigHome(const QString &confighome);
     void insertItemConfig(const QString &itemname, const QString &colname);
--- trunk/playground/pim/akonaditest/config.xml #854964:854965
@@ -1,4 +1,5 @@
 <config>
+  <kdehome>kde</kdehome>
   <confighome>config</confighome>
   <datahome>local/share</datahome>
 <!--  <item location="test.vcf" collection="akonadi_vcard_resource_0" />-->
--- trunk/playground/pim/akonaditest/configreader.cpp #854964:854965
@@ -46,7 +46,9 @@
     QDomElement e = n.toElement();
     if( !e.isNull() ) {
 
-      if( e.tagName() == "confighome" ){
+      if( e.tagName() == "kdehome" ){
+        setKdeHome( e.text() );
+      } else if( e.tagName() == "confighome" ){
         setXdgConfigHome( e.text() );
       } else {
         if( e.tagName() == "datahome" ){
--- trunk/playground/pim/akonaditest/setup.cpp #854964:854965
@@ -134,10 +134,12 @@
 
   Config *config = Config::getInstance();
 
+  setenv("KDEHOME", config->getKdeHome().toAscii() , 1 );
   setenv("XDG_DATA_HOME", config->getXdgDataHome().toAscii() , 1 );
   setenv("XDG_CONFIG_HOME", config->getXdgConfigHome().toAscii() , 1 );
 
   Symbols *symbol = Symbols::getInstance();
+  symbol->insertSymbol("KDEHOME", config->getKdeHome());
   symbol->insertSymbol("XDG_DATA_HOME", config->getXdgDataHome());
   symbol->insertSymbol("XDG_CONFIG_HOME", config->getXdgConfigHome());
 
[prev in list] [next in list] [prev in thread] [next in thread]