[rkward-cvs] SF.net SVN: rkward: [1095] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 1095
          http://svn.sourceforge.net/rkward/?rev=1095&view=rev
Author:   tfry
Date:     2007-01-08 06:47:42 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
use RKCommonFunctions::getRKWardDataDir (), whereever we need to find out about that dir

Modified Paths:
--------------
    trunk/rkward/rkward/dialogs/startupdialog.cpp
    trunk/rkward/rkward/misc/rkobjectlistview.cpp
    trunk/rkward/rkward/settings/rksettingsmodulephp.cpp

Modified: trunk/rkward/rkward/dialogs/startupdialog.cpp
===================================================================
--- trunk/rkward/rkward/dialogs/startupdialog.cpp	2007-01-08 14:41:19 UTC (rev 1094)
+++ trunk/rkward/rkward/dialogs/startupdialog.cpp	2007-01-08 14:47:42 UTC (rev 1095)
@@ -33,10 +33,9 @@
 	#include <kactionclasses.h>
 #endif
 #include <klocale.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
 
 #include "../settings/rksettingsmodulegeneral.h"
+#include "../misc/rkcommonfunctions.h"
 #include "../debug.h"
 
 StartupDialog::StartupDialog (QWidget *parent, StartupDialogResult *result, KRecentFilesAction *recent_files) : QDialog (parent, 0, true) {
@@ -47,7 +46,7 @@
 
 	QVBoxLayout *vbox = new QVBoxLayout (this);
 	
-	logo = new QPixmap (KGlobal::dirs ()->findResourceDir ("data", "rkward/phpfiles/common.php") + "rkward/icons/rkward_logo.png");
+	logo = new QPixmap (RKCommonFunctions::getRKWardDataDir () + "icons/rkward_logo.png");
 	QLabel *pic = new QLabel (this);
 	pic->setPixmap (*logo);
 	vbox->addWidget (pic);

Modified: trunk/rkward/rkward/misc/rkobjectlistview.cpp
===================================================================
--- trunk/rkward/rkward/misc/rkobjectlistview.cpp	2007-01-08 14:41:19 UTC (rev 1094)
+++ trunk/rkward/rkward/misc/rkobjectlistview.cpp	2007-01-08 14:47:42 UTC (rev 1095)
@@ -17,8 +17,6 @@
 #include "rkobjectlistview.h"
 
 #include <klocale.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
 #include <kiconloader.h>
 
 #include <qpopupmenu.h>
@@ -33,6 +31,7 @@
 #include "../core/rkmodificationtracker.h"
 #include "../settings/rksettings.h"
 #include "../settings/rksettingsmoduleobjectbrowser.h"
+#include "../misc/rkcommonfunctions.h"
 #include "../debug.h"
 
 // static
@@ -44,8 +43,8 @@
 RKObjectListView::RKObjectListView (QWidget *parent) : QListView (parent) {
 	RK_TRACE (APP);
 	if (icon_function == 0) {
-		icon_function = new QPixmap (QImage (KGlobal::dirs ()->findResourceDir ("data", "rkward/phpfiles/common.php") + "rkward/icons/function.png"));
-		icon_list = new QPixmap (QImage (KGlobal::dirs ()->findResourceDir ("data", "rkward/phpfiles/common.php") + "rkward/icons/list.png"));
+		icon_function = new QPixmap (QImage (RKCommonFunctions::getRKWardDataDir () + "icons/function.png"));
+		icon_list = new QPixmap (QImage (RKCommonFunctions::getRKWardDataDir () + "icons/list.png"));
 		package_environment = new QPixmap (SmallIcon ("ark", 12));
 		environment = new QPixmap (SmallIcon ("konqueror", 12));
 	}

Modified: trunk/rkward/rkward/settings/rksettingsmodulephp.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmodulephp.cpp	2007-01-08 14:41:19 UTC (rev 1094)
+++ trunk/rkward/rkward/settings/rksettingsmodulephp.cpp	2007-01-08 14:47:42 UTC (rev 1095)
@@ -18,13 +18,12 @@
 
 #include <klocale.h>
 #include <kconfig.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
 
 #include <qlayout.h>
 #include <qlabel.h>
 
 #include "../misc/getfilenamewidget.h"
+#include "../misc/rkcommonfunctions.h"
 #include "../rkglobals.h"
 #include "../debug.h"
 
@@ -98,7 +97,7 @@
 
 	config->setGroup ("PHP Settings");
 	php_bin = config->readEntry ("PHP binary", "/usr/bin/php");
-	files_path = config->readEntry ("support files dir", KGlobal::dirs ()->findResourceDir ("data", "rkward/phpfiles/common.php") + "rkward/phpfiles/");
+	files_path = config->readEntry ("support files dir", RKCommonFunctions::getRKWardDataDir () + "phpfiles/");
 }
 
 #include "rksettingsmodulephp.moc"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.