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

List:       kde-commits
Subject:    playground/utils/dolphin/src
From:       Peter Penz <peter.penz () gmx ! at>
Date:       2007-01-30 19:31:43
Message-ID: 1170185503.518644.5881.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 628641 by ppenz:

update to changes in class KGlobal (kdelibs)

 M  +2 -3      dolphinmainwindow.cpp  
 M  +3 -2      dolphinsettings.cpp  
 M  +2 -1      viewproperties.cpp  


--- trunk/playground/utils/dolphin/src/dolphinmainwindow.cpp #628640:628641
@@ -324,7 +324,7 @@
 
     // TODO: I assume there will be a generic way in KDE 4 to store the docks
     // of the main window. In the meantime they are stored manually:
-    QString filename = KStandardDirs::locateLocal("data", \
KGlobal::instance()->instanceName()); +    QString filename = \
KStandardDirs::locateLocal("data", KGlobal::mainComponent().componentName());  \
filename.append("/panels_layout");  QFile file(filename);
     if (file.open(QIODevice::WriteOnly)) {
@@ -924,8 +924,7 @@
     // TODO: I assume there will be a generic way in KDE 4 to restore the docks
     // of the main window. In the meantime they are restored manually (see also
     // DolphinMainWindow::closeEvent() for more details):
-    QString filename = KStandardDirs::locateLocal("data", \
                KGlobal::instance()->instanceName());
-    filename.append("/panels_layout");
+    QString filename = KStandardDirs::locateLocal("data", \
KGlobal::mainComponent().componentName());   filename.append("/panels_layout");  \
QFile file(filename);  if (file.open(QIODevice::ReadOnly)) {
         QByteArray data = file.readAll();
--- trunk/playground/utils/dolphin/src/dolphinsettings.cpp #628640:628641
@@ -25,6 +25,7 @@
 
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
+#include <kcomponentdata.h>
 #include <kicontheme.h>
 #include <kinstance.h>
 #include <klocale.h>
@@ -63,7 +64,7 @@
 
 KBookmarkManager* DolphinSettings::bookmarkManager() const
 {
-    QString basePath = KGlobal::instance()->instanceName();
+    QString basePath = KGlobal::mainComponent().componentName();
     basePath.append("/bookmarks.xml");
     const QString file = KStandardDirs::locateLocal("data", basePath);
 
@@ -76,7 +77,7 @@
     m_iconsModeSettings->writeConfig();
     m_detailsModeSettings->writeConfig();
 
-    QString basePath = KGlobal::instance()->instanceName();
+    QString basePath = KGlobal::mainComponent().componentName();
     basePath.append("/bookmarks.xml");
     const QString file = KStandardDirs::locateLocal( "data", basePath);
 
--- trunk/playground/utils/dolphin/src/viewproperties.cpp #628640:628641
@@ -23,6 +23,7 @@
 #include <QDateTime>
 #include <QFile>
 
+#include <kcomponentdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
@@ -178,7 +179,7 @@
 
 QString ViewProperties::destinationDir(const QString& subDir) const
 {
-    QString basePath = KGlobal::instance()->instanceName();
+    QString basePath = KGlobal::mainComponent().componentName();
     basePath.append("/view_properties/").append(subDir);
     return KStandardDirs::locateLocal("data", basePath);
 }


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